mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-07 03:29:59 +00:00
Code Issues Projects Releases Wiki Activity

cmpi-bindings: append PYTHON_ABI suffix to libpython soname

Browse Source 
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 <raj.khem@gmail.com>
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
This commit is contained in:
Khem Raj
2020-01-10 00:47:00 -08:00
parent c8ca82feb5
commit 425ae63835
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
+2 -7
View File
@@ -9,19 +9,14 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
swig/python/CMakeLists.txt | 2 +- swig/python/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 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 --- a/swig/python/CMakeLists.txt
+++ b/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 ) SET( NAME pyCmpiProvider )
ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT}) ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT})
#TARGET_LINK_LIBRARIES( ${NAME} ${PYTHON_LIBRARIES} ) #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} )
+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} pthread )
TARGET_LINK_LIBRARIES( ${NAME} dl ) TARGET_LINK_LIBRARIES( ${NAME} dl )
TARGET_LINK_LIBRARIES( ${NAME} util ) TARGET_LINK_LIBRARIES( ${NAME} util )
--
2.8.1
meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb
+3 -1
View File
@@ -22,7 +22,9 @@ S = "${WORKDIR}/git"
inherit cmake python3native inherit cmake python3native
EXTRA_OECMAKE = "-DLIB='${baselib}' \ 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: # With Ninja it fails with:
# ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$) # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$)