From 58b0cdd1d6239e8f2125426db8297fde4c002342 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 24 May 2016 14:57:00 +0300 Subject: cmpi-bindings: fix build with python 3 This recipe seemed to have a floating dependency on Python 3, so let's make it fixed. Signed-off-by: Alexander Kanavin Signed-off-by: Martin Jansa --- ...HON_ABI-suffix-to-the-python-library-name.patch | 27 ++++++++++++++++++++++ .../cmpi-bindings/cmpi-bindings_git.bb | 5 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch new file mode 100644 index 0000000000..b2a149b0f4 --- /dev/null +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch @@ -0,0 +1,27 @@ +From a701ed30ac1bc2f77d063c237d6ae040a2d53f6b Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 16 May 2016 16:52:24 +0300 +Subject: [PATCH] Add 'm' suffix to the python library name. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + 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) + 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} pthread ) + TARGET_LINK_LIBRARIES( ${NAME} dl ) + TARGET_LINK_LIBRARIES( ${NAME} util ) +-- +2.8.1 + diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb index a2747c3508..63fc849d28 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://github.com/kkaempf/cmpi-bindings" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064" SECTION = "Development/Libraries" -DEPENDS = "swig-native python sblim-cmpi-devel" +DEPENDS = "swig-native python3 sblim-cmpi-devel" SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http \ file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ @@ -13,12 +13,13 @@ SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http \ file://0001-Modify-cmakelist.patch \ file://0001-Fix-error.patch \ file://0001-fix-the-build-error-when-python-3.0.patch \ + file://0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch \ " SRCREV = "62f60e065aa1b901f826e4f530c0573ae32d065e" S = "${WORKDIR}/git" -inherit cmake pythonnative +inherit cmake python3native EXTRA_OECMAKE = "-DLIB='${baselib}' \ -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION}" -- cgit 1.2.3-korg