sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

libzypp: fix for non /usr/lib libdir case 

this patch has two fixes:
1. the src tool/CMakeLists.txt has hardcode "lib", so add a patch to fix it
2. the recipe has hardcode "-DLIB=lib", so replace it with libdir

(From OE-Core rev: d415c10f8488e0cc4b175ad3d985748d07bbedaa)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yu Ke 2011-07-13 16:58:27 +08:00 committed by Richard Purdie
parent 4e01f730bf
commit d3e6228205
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch Normal file
View File

@ -0,0 +1,22 @@
tools/CMakeLists.txt: replace the hardcode "lib"
replace the hardcode "lib" with LIB_INSTALL_DIR
this will work with non /usr/lib libdir case
Upstream-Status: Pending
Signed-off-by: Yu Ke <ke.yu@intel.com>
Index: libzypp/tools/CMakeLists.txt
===================================================================
--- libzypp.orig/tools/CMakeLists.txt
+++ libzypp/tools/CMakeLists.txt
@@ -1,7 +1,7 @@
ADD_SUBDIRECTORY( package-manager )
-INSTALL( FILES notify-message DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/zypp" )
+INSTALL( FILES notify-message DESTINATION "${LIB_INSTALL_DIR}/zypp" )
## ############################################################

5
meta/recipes-extended/libzypp/libzypp_git.bb
View File

@ -14,7 +14,7 @@ RDEPENDS_${PN} = "sat-solver"
S = "${WORKDIR}/git"
SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
PV = "0.0-git${SRCPV}"
PR = "r10"
PR = "r11"
SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
file://no-doc.patch \
@ -23,6 +23,7 @@ SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
file://config-release.patch \
file://libzypp-pokyarch.patch \
file://fix_for_compile_wth_gcc-4.6.0.patch \
file://hardcode-lib-fix.patch \
"
SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
@ -33,7 +34,7 @@ SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch"
FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons"
FILES_${PN}-dev += "${datadir}/cmake"
EXTRA_OECMAKE += "-DLIB=lib"
EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
PACKAGE_ARCH = "${MACHINE_ARCH}"