summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/zlib
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2013-05-16 17:11:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-20 23:18:46 (GMT)
commit6271ac326d08fb3e9b4c2008b796233ee11a83e4 (patch)
tree57d2302144830b1290dac0c3139decf7836b72c7 /meta/recipes-core/zlib
parentf6d44383a1bd2360830629f7f133ba522d0abebe (diff)
downloadpoky-6271ac326d08fb3e9b4c2008b796233ee11a83e4.tar.gz
zlib: put shared libraries in base_libdir
We put the shared libraries in base_libdir because at least one library under base_libdir, pam_cracklib.so, needs them and will cause a qa warning when it is built. (From OE-Core rev: ebb8382af892bef8e11fb590292506e1124276c5) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Saul Wold <sgw@linux.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.7.bb15
1 files changed, 15 insertions, 0 deletions
diff --git a/meta/recipes-core/zlib/zlib_1.2.7.bb b/meta/recipes-core/zlib/zlib_1.2.7.bb
index 803fec3..dfdf5fe 100644
--- a/meta/recipes-core/zlib/zlib_1.2.7.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.7.bb
@@ -6,6 +6,8 @@ SECTION = "libs"
6LICENSE = "Zlib" 6LICENSE = "Zlib"
7LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=94d1b5a40dadd127f3351471727e66a9" 7LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=94d1b5a40dadd127f3351471727e66a9"
8 8
9PR = "r1"
10
9SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \ 11SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
10 file://remove.ldconfig.call.patch \ 12 file://remove.ldconfig.call.patch \
11 " 13 "
@@ -24,4 +26,17 @@ do_install() {
24 oe_runmake DESTDIR=${D} install 26 oe_runmake DESTDIR=${D} install
25} 27}
26 28
29# We move zlib shared libraries for target builds to avoid
30# qa warnings.
31#
32do_install_append_class-target() {
33 if [ ${base_libdir} != ${libdir} ]
34 then
35 mkdir -p ${D}/${base_libdir}
36 mv ${D}/${libdir}/libz.so.* ${D}/${base_libdir}
37 tmp=`readlink ${D}/${libdir}/libz.so`
38 ln -sf ../../${base_libdir}/$tmp ${D}/${libdir}/libz.so
39 fi
40}
41
27BBCLASSEXTEND = "native nativesdk" 42BBCLASSEXTEND = "native nativesdk"