Skip to content

Detect xml2mod with soabi #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Detect xml2mod with soabi #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19f19ac
Make the code future-proof against removal of distutils module.
mcepl May 17, 2022
6b370a4
Don't be too complicated.
mcepl Oct 17, 2022
a796f81
Make the discovery of the build .so file more robust.
mcepl Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,11 @@ PACKAGE := python-dmidecode
PY_VER := $(shell $(PY_BIN) -c 'import sys; print("%d.%d"%sys.version_info[0:2])')
PY_MV := $(shell echo $(PY_VER) | cut -b 1)
PY := python$(PY_VER)
SO_PATH := build/lib.linux-$(shell uname -m)-$(PY_VER)
ifeq ($(PY_MV),2)
SO := $(SO_PATH)/dmidecodemod.so
SOLIB := dmidecodemod.so
else
SOABI := $(shell $(PY_BIN) -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))')
SO := $(SO_PATH)/dmidecodemod.$(SOABI).so
SOLIB := dmidecodemod.$(SOABI).so
endif
SHELL := /bin/bash

Expand All @@ -59,10 +58,10 @@ SHELL := /bin/bash
all : build dmidump

build: $(PY)-dmidecodemod.so
$(PY)-dmidecodemod.so: $(SO)
cp $< $@
$(SO):

$(PY)-dmidecodemod.so:
$(PY) src/setup.py build
cp $$(find build -name $(SOLIB)) $@

dmidump : src/util.o src/efi.o src/dmilog.o
$(CC) -o $@ src/dmidump.c $^ -g -Wall -D_DMIDUMP_MAIN_
Expand Down
9 changes: 6 additions & 3 deletions src/setup_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
if sys.version_info[0] < 3:
import commands as subprocess
from os import path as os_path
from distutils.sysconfig import get_python_lib
from sysconfig import get_config_var, get_path

# libxml2 - C flags
def libxml2_include(incdir):
Expand All @@ -50,7 +50,7 @@ def libxml2_include(incdir):

# libxml2 - library flags
def libxml2_lib(libdir, libs):
libdir.append(get_python_lib(1))
libdir.append(get_path('platlib'))
if os_path.exists("/etc/debian_version"): #. XXX: Debian Workaround...
libdir.append("/usr/lib/pymodules/python%d.%d"%sys.version_info[0:2])

Expand All @@ -69,7 +69,10 @@ def libxml2_lib(libdir, libs):
libs.append(l.replace("-l", "", 1))

# this library is not reported and we need it anyway
libs.append('xml2mod')
if get_config_var("SOABI"):
libs.append('xml2mod.%s' % get_config_var("SOABI"))
else:
libs.append('xml2mod')



Expand Down