summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/zlib
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-05-20 14:38:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-28 08:44:08 (GMT)
commit53f761d05ee22c6139d3ff77fa2ce85bf9723b76 (patch)
tree4094439d77ae81b93fa11b8ab1f45a0fa6282c51 /meta/recipes-core/zlib
parentc583473a2bd4c8d136254de8185d196282b5c34c (diff)
downloadpoky-53f761d05ee22c6139d3ff77fa2ce85bf9723b76.tar.gz
zlib: clean up base_libdir symlink
libz.so symbolic link created in ${libdir} is ../../${base_libdir}/libz.so.1.2.8. This doesn't work if base_libdir or libdir is changed, so use oe.path.relative to construct the correct path at build time. (From OE-Core rev: ada8972ec40441b06e50d3e9ccbc07241a48e30a) (From OE-Core rev: 20a60f137a9a1ae2689286241cc3d68a0392803d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/zlib')
-rw-r--r--meta/recipes-core/zlib/zlib_1.2.8.bb10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-core/zlib/zlib_1.2.8.bb b/meta/recipes-core/zlib/zlib_1.2.8.bb
index ca0ba3f..9470adb 100644
--- a/meta/recipes-core/zlib/zlib_1.2.8.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.8.bb
@@ -6,7 +6,6 @@ SECTION = "libs"
6LICENSE = "Zlib" 6LICENSE = "Zlib"
7LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b73844a0c494fd" 7LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b73844a0c494fd"
8 8
9
10SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.xz \ 9SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.xz \
11 file://remove.ldconfig.call.patch \ 10 file://remove.ldconfig.call.patch \
12 file://Makefile-runtests.patch \ 11 file://Makefile-runtests.patch \
@@ -45,16 +44,15 @@ do_install_ptest() {
45 install ${B}/minigzipsh ${D}${PTEST_PATH} 44 install ${B}/minigzipsh ${D}${PTEST_PATH}
46} 45}
47 46
48# We move zlib shared libraries for target builds to avoid 47# Move zlib shared libraries for target builds to $base_libdir so the library
49# qa warnings. 48# can be used in early boot before $prefix is mounted.
50#
51do_install_append_class-target() { 49do_install_append_class-target() {
52 if [ ${base_libdir} != ${libdir} ] 50 if [ ${base_libdir} != ${libdir} ]
53 then 51 then
54 mkdir -p ${D}/${base_libdir} 52 mkdir -p ${D}/${base_libdir}
55 mv ${D}/${libdir}/libz.so.* ${D}/${base_libdir} 53 mv ${D}/${libdir}/libz.so.* ${D}/${base_libdir}
56 tmp=`readlink ${D}/${libdir}/libz.so` 54 libname=`readlink ${D}/${libdir}/libz.so`
57 ln -sf ../../${base_libdir}/$tmp ${D}/${libdir}/libz.so 55 ln -sf ${@oe.path.relative("${libdir}", "${base_libdir}")}/$libname ${D}${libdir}/libz.so
58 fi 56 fi
59} 57}
60 58