Patchwork [[v1] 1/1] zlib: put shared libraries in base_libdir

login
register
mail settings
Submitter Joe Slater
Date May 15, 2013, 9:17 p.m.
Message ID <1368652657-3841-1-git-send-email-jslater@windriver.com>
Download mbox | patch
Permalink /patch/49963/
State Accepted
Commit ebb8382af892bef8e11fb590292506e1124276c5
Headers show

Comments

Joe Slater - May 15, 2013, 9:17 p.m.
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.
---
 meta/recipes-core/zlib/zlib_1.2.7.bb |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
Saul Wold - May 16, 2013, 7:28 a.m.
On 05/16/2013 12:17 AM, Joe Slater wrote:
> 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.

missing a Signed-off-by: and the [v1] seems to cause the subject to
get parsed wrong.

Sau!

> ---
>   meta/recipes-core/zlib/zlib_1.2.7.bb |   15 +++++++++++++++
>   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"
>   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"
>

Patch

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"
 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"