summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-07-13 16:58:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-13 12:14:20 +0100
commitd3e62282055c71eeeeb96b31be1059b638fc2ac9 (patch)
tree27d6b88ca95ac81930a1a1f4a73047da567f012c /meta
parent4e01f730bf1840d43ae7f95bbf51d85d7d030493 (diff)
downloadpoky-d3e62282055c71eeeeb96b31be1059b638fc2ac9.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch22
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb5
2 files changed, 25 insertions, 2 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch b/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch
new file mode 100644
index 0000000000..c11f5c53c9
--- /dev/null
+++ b/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch
@@ -0,0 +1,22 @@
1tools/CMakeLists.txt: replace the hardcode "lib"
2
3replace the hardcode "lib" with LIB_INSTALL_DIR
4this will work with non /usr/lib libdir case
5
6Upstream-Status: Pending
7
8Signed-off-by: Yu Ke <ke.yu@intel.com>
9
10Index: libzypp/tools/CMakeLists.txt
11===================================================================
12--- libzypp.orig/tools/CMakeLists.txt
13+++ libzypp/tools/CMakeLists.txt
14@@ -1,7 +1,7 @@
15
16 ADD_SUBDIRECTORY( package-manager )
17
18-INSTALL( FILES notify-message DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/zypp" )
19+INSTALL( FILES notify-message DESTINATION "${LIB_INSTALL_DIR}/zypp" )
20
21 ## ############################################################
22
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 824f7a1339..6555bd4044 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -14,7 +14,7 @@ RDEPENDS_${PN} = "sat-solver"
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" 15SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
16PV = "0.0-git${SRCPV}" 16PV = "0.0-git${SRCPV}"
17PR = "r10" 17PR = "r11"
18 18
19SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ 19SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
20 file://no-doc.patch \ 20 file://no-doc.patch \
@@ -23,6 +23,7 @@ SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
23 file://config-release.patch \ 23 file://config-release.patch \
24 file://libzypp-pokyarch.patch \ 24 file://libzypp-pokyarch.patch \
25 file://fix_for_compile_wth_gcc-4.6.0.patch \ 25 file://fix_for_compile_wth_gcc-4.6.0.patch \
26 file://hardcode-lib-fix.patch \
26 " 27 "
27 28
28SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" 29SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
@@ -33,7 +34,7 @@ SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch"
33FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons" 34FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons"
34FILES_${PN}-dev += "${datadir}/cmake" 35FILES_${PN}-dev += "${datadir}/cmake"
35 36
36EXTRA_OECMAKE += "-DLIB=lib" 37EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
37 38
38PACKAGE_ARCH = "${MACHINE_ARCH}" 39PACKAGE_ARCH = "${MACHINE_ARCH}"
39 40