diff options
| author |   Ross Burton <ross.burton@intel.com> | 2015-05-20 15:38:49 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-21 10:48:47 +0100 |
| commit | ada8972ec40441b06e50d3e9ccbc07241a48e30a (patch) | |
| tree | f7a2560e7264ecc6766a5ace45d287375c84a70c /meta/recipes-core/zlib | |
| parent | d4bf858b2c15bef128fd6d606b08203a318e2d4c (diff) | |
| download | openembedded-core-contrib-ada8972ec40441b06e50d3e9ccbc07241a48e30a.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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/zlib')
| -rw-r--r-- | meta/recipes-core/zlib/zlib_1.2.8.bb | 10 |
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 ca0ba3ff6e..9470adb1be 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" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b73844a0c494fd" - SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.xz \ file://remove.ldconfig.call.patch \ file://Makefile-runtests.patch \ @@ -45,16 +44,15 @@ do_install_ptest() { install ${B}/minigzipsh ${D}${PTEST_PATH} } -# We move zlib shared libraries for target builds to avoid -# qa warnings. -# +# Move zlib shared libraries for target builds to $base_libdir so the library +# can be used in early boot before $prefix is mounted. do_install_append_class-target() { if [ ${base_libdir} != ${libdir} ] then mkdir -p ${D}/${base_libdir} mv ${D}/${libdir}/libz.so.* ${D}/${base_libdir} - tmp=`readlink ${D}/${libdir}/libz.so` - ln -sf ../../${base_libdir}/$tmp ${D}/${libdir}/libz.so + libname=`readlink ${D}/${libdir}/libz.so` + ln -sf ${@oe.path.relative("${libdir}", "${base_libdir}")}/$libname ${D}${libdir}/libz.so fi } |