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.

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>

diff --git a/meta/recipes-core/zlib/zlib_1.2.7.bb b/meta/recipes-core/zlib/zlib_1.2.7.bb
index 803fec35c40da73d442d916152ca19479a427886..dfdf5fe2d609450210790be5e266ec6fdb637314 100644 (file)
--- 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"
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=94d1b5a40dadd127f3351471727e66a9"
 
+PR = "r1"
+
 SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
            file://remove.ldconfig.call.patch \
            "
@@ -24,4 +26,17 @@ do_install() {
        oe_runmake DESTDIR=${D} install
 }
 
+# We move zlib shared libraries for target builds to avoid
+# qa warnings.
+#
+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
+       fi
+}
+
 BBCLASSEXTEND = "native nativesdk"