diff options
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" | |||
6 | LICENSE = "Zlib" | 6 | LICENSE = "Zlib" |
7 | LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b73844a0c494fd" | 7 | LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b73844a0c494fd" |
8 | 8 | ||
9 | |||
10 | SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.xz \ | 9 | SRC_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 | # | ||
51 | do_install_append_class-target() { | 49 | do_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 | ||