summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-12-18 23:41:19 -0800
committerKhem Raj <raj.khem@gmail.com>2019-12-19 13:56:59 -0800
commit989b67be6d0fcadfd3ab52d27663a06c1e8f61ca (patch)
treed0e06d4c8d8029965295e792b4dc83d5e53fb1b4
parent130cc706f12f37f6cc0d682e93aab9ca6fe76be2 (diff)
downloadmeta-openembedded-989b67be6d0fcadfd3ab52d27663a06c1e8f61ca.tar.gz
libcec: Fix multilib build
Fixes ERROR: libcec-4.0.4-r0 do_package: QA Issue: libcec: Files/directories were installed but not shipped in any package: /usr/lib/python3.7/site-packages/_cec.so /usr/lib/python3.7/site-packages/cec.py Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch42
-rw-r--r--meta-oe/recipes-extended/libcec/libcec_git.bb3
2 files changed, 44 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch b/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch
new file mode 100644
index 000000000..3ecbfce25
--- /dev/null
+++ b/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch
@@ -0,0 +1,42 @@
1From 95d4df3b713925e2c4894a2e4d50b06df861d9ef Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Dec 2019 23:37:40 -0800
4Subject: [PATCH] CheckPlatformSupport.cmake: Do not hardcode lib path
5
6Using CMAKE_INSTALL_LIBDIR ensures that we can build for multilib env
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/libcec/cmake/CheckPlatformSupport.cmake | 10 +++++-----
12 1 file changed, 5 insertions(+), 5 deletions(-)
13
14diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake
15index 2d7102f..55e78f8 100644
16--- a/src/libcec/cmake/CheckPlatformSupport.cmake
17+++ b/src/libcec/cmake/CheckPlatformSupport.cmake
18@@ -224,16 +224,16 @@ else()
19
20 if (${PYTHON_MAJOR_VERSION} EQUAL 2)
21 install(TARGETS ${SWIG_MODULE_cec_REAL_NAME}
22- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec)
23+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec)
24 install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py
25- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
26+ DESTINATION l${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
27 install(FILES ${CMAKE_SOURCE_DIR}/src/libcec/cmake/__init__.py
28- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec)
29+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec)
30 else()
31 install(TARGETS ${SWIG_MODULE_cec_REAL_NAME}
32- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH})
33+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH})
34 install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py
35- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
36+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
37 endif()
38 endif()
39 endif()
40--
412.24.1
42
diff --git a/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-oe/recipes-extended/libcec/libcec_git.bb
index eaf6b9b43..8d5a82455 100644
--- a/meta-oe/recipes-extended/libcec/libcec_git.bb
+++ b/meta-oe/recipes-extended/libcec/libcec_git.bb
@@ -13,7 +13,8 @@ PV = "4.0.4"
13 13
14SRCREV = "3bbd4321618503d14008387a72fabb6743878831" 14SRCREV = "3bbd4321618503d14008387a72fabb6743878831"
15SRC_URI = "git://github.com/Pulse-Eight/libcec.git \ 15SRC_URI = "git://github.com/Pulse-Eight/libcec.git \
16" 16 file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \
17 "
17 18
18S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
19 20