summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libzypp/libzypp
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/recipes-extended/libzypp/libzypp
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/recipes-extended/libzypp/libzypp')
-rw-r--r--meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch22
1 files changed, 22 insertions, 0 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