diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-04-06 11:52:55 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-04-06 11:52:55 +0000 |
| commit | 5ad39eb0bc5bbf7ebe716009c4551ff44b1d0f14 (patch) | |
| tree | c8ef046d78c43c9d67b8bfdb2c814ab15cd00fb1 /recipes/libmng | |
| parent | 95cd55f0b71a8620bcd70dfb2fa8c053a4f1a39f (diff) | |
libmng: use LDFLAGS (fixes QA error)
Diffstat (limited to 'recipes/libmng')
| -rw-r--r-- | recipes/libmng/libmng/ldflags.patch | 12 | ||||
| -rw-r--r-- | recipes/libmng/libmng_1.0.8.bb | 9 |
2 files changed, 17 insertions, 4 deletions
diff --git a/recipes/libmng/libmng/ldflags.patch b/recipes/libmng/libmng/ldflags.patch new file mode 100644 index 0000000000..078f552c8d --- /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 9619cf4c53..d737e3366b 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} } |