cmpi-bindings: append PYTHON_ABI suffix to libpython soname
PATCH v2 1/1 cmpi-bindings: append PYTHON_ABI suffix to libpython soname
This makes it independent of python vesion 3.7 or 3.8 where with python 3.7 has 'm' as abi suffix but 3.8 wont
Signed-off-by Khem Raj <[email protected]>
Cc Alexander Kanavin <[email protected]>
---
v2: Do not hardcode 'm' ABI suffix
...dd-PYTHON_ABI-suffix-to-the-python-library-name.patch | 9 ++------- .../cmpi-bindings/cmpi-bindings_1.0.1.bb | 4 +++- 2 files changed, 5 insertions(+), 8 deletions(-)
meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch +2 -7
@@ -9,19 +9,14 @@ Signed-off-by: Alexander Kanavin <[email protected]> swig/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt -index 128798b..391cef7 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt -@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GENERIC_GNU -DCMPI_VERSION=200) +@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GE SET( NAME pyCmpiProvider ) ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT}) #TARGET_LINK_LIBRARIES( ${NAME} ${PYTHON_LIBRARIES} ) -TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION} ) -+TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}m ) ++TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}${PYTHON_ABI} ) TARGET_LINK_LIBRARIES( ${NAME} pthread ) TARGET_LINK_LIBRARIES( ${NAME} dl ) TARGET_LINK_LIBRARIES( ${NAME} util ) --- -2.8.1 -
meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +3 -1
@@ -22,7 +22,9 @@ S = "${WORKDIR}/git" inherit cmake python3native EXTRA_OECMAKE = "-DLIB='${baselib}' \ - -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION}" + -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ + -DPYTHON_ABI=${PYTHON_ABI} \ + " # With Ninja it fails with: # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$)
Signature · 1 line
2.24.1