Re: [STABLE][PATCH] libmng: use LDFLAGS (fixes QA error)

[Koen Kooi <k.kooi@student.utwente.nl>]

On 06-04-09 14:18, Jeremy Lainé wrote:
> From: Jeremy Lainé<jeremy.laine@m4x.org>

Acked-by: Koen Kooi <koen@openembedded.org>

>
>
> Signed-off-by: Jeremy Lainé<jeremy.laine@m4x.org>
> ---
>   recipes/libmng/libmng/ldflags.patch |   12 ++++++++++++
>   recipes/libmng/libmng_1.0.8.bb      |    9 +++++----
>   2 files changed, 17 insertions(+), 4 deletions(-)
>   create mode 100644 recipes/libmng/libmng/ldflags.patch
>
> diff --git a/recipes/libmng/libmng/ldflags.patch b/recipes/libmng/libmng/ldflags.patch
> new file mode 100644
> index 0000000..078f552
> --- /dev/null
> +++ b/recipes/libmng/libmng/ldflags.patch
> @@ -0,0 +1,12 @@
> +diff -urN libmng-1.0.8.orig/makefiles/makefile.linux libmng-1.0.8/makefiles/makefile.linux
> +--- libmng-1.0.8.orig/makefiles/makefile.linux	2004-08-06 07:17:40.000000000 +0000
> ++++ libmng-1.0.8/makefiles/makefile.linux	2009-04-06 11:49:45.000000000 +0000
> +@@ -105,7 +105,7 @@
> + libmng.so.$(MNGVER): $(OBJSDLL)
> + #	$(CC) -shared -Wl,-soname,libmng.so.$(MNGMAJ) -o libmng.so.$(MNGVER) \
> + #	$(OBJSDLL) -L$(ZLIBLIB) -L$(JPEGLIB) -L$(LCMSLIB) -lz -lm -lc
> +-	$(CC) -shared -Wl,-soname,libmng.so.$(MNGMAJ) -o libmng.so.$(MNGVER) \
> ++	$(CC) $(LDFLAGS) -shared -Wl,-soname,libmng.so.$(MNGMAJ) -o libmng.so.$(MNGVER) \
> + 	$(OBJSDLL) -L$(ZLIBLIB) -L$(JPEGLIB) -ljpeg -L$(LCMSLIB) -llcms \
> +     -lz -lm -lc
> +
> diff --git a/recipes/libmng/libmng_1.0.8.bb b/recipes/libmng/libmng_1.0.8.bb
> index 9619cf4..d737e33 100644
> --- a/recipes/libmng/libmng_1.0.8.bb
> +++ b/recipes/libmng/libmng_1.0.8.bb
> @@ -2,7 +2,10 @@ DESCRIPTION = "MNG Library"
>   SECTION = "libs"
>   DEPENDS = "zlib jpeg lcms"
>   LICENSE = "libmng"
> -SRC_URI = "${SOURCEFORGE_MIRROR}/libmng/libmng-${PV}.tar.gz"
> +PR = "r1"
> +
> +SRC_URI = "${SOURCEFORGE_MIRROR}/libmng/libmng-${PV}.tar.gz \
> +           file://ldflags.patch;patch=1"
>
>   inherit pkgconfig
>
> @@ -10,13 +13,12 @@ EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR} \
>   			JPEGINC= JPEGLIB= LCMSINC= LCMSLIB="
>
>   do_compile() {
> -	unset LDFLAGS
>   	oe_runmake -f makefiles/makefile.linux
>   }
>
>   do_stage() {
>   	oe_libinstall -so libmng ${STAGING_LIBDIR}
> -        install -m 0644 ${S}/libmng.h ${STAGING_INCDIR}/
> +	install -m 0644 ${S}/libmng.h ${STAGING_INCDIR}/
>   	install -m 0644 ${S}/libmng_conf.h ${STAGING_INCDIR}/
>   	install -m 0644 ${S}/libmng_types.h ${STAGING_INCDIR}/
>   }
> @@ -24,7 +26,6 @@ do_stage() {
>   do_install() {
>   	install -d ${D}${bindir} ${D}${mandir} \
>   		   ${D}${libdir} ${D}${includedir}
> -	unset LDFLAGS
>   	oe_runmake -f makefiles/makefile.linux install \
>   	INCPATH="${D}${includedir}" LIBPATH="${D}${libdir}" prefix=${prefix}
>   }