summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim 'timtim' Ellis <tim.ellis@foonas.org>2009-05-16 21:03:52 +0100
committerTim 'timtim' Ellis <tim.ellis@foonas.org>2009-05-16 21:03:52 +0100
commit19b858ceca4955f104b1c71d8526bd6623f68f72 (patch)
tree765d08b6f1371f4a2a099f9ac5cc73c2c77e91a7
parent0d55f9e5437752940602caff7aace9c7994409e1 (diff)
netpbm: Make this aware of LDFLAGS, fixes QA GNU_HASH issue
-rw-r--r--recipes/netpbm/netpbm-10.28/libgnuhash.patch12
-rw-r--r--recipes/netpbm/netpbm_10.28.bb3
2 files changed, 14 insertions, 1 deletions
diff --git a/recipes/netpbm/netpbm-10.28/libgnuhash.patch b/recipes/netpbm/netpbm-10.28/libgnuhash.patch
new file mode 100644
index 0000000000..3df92ca668
--- /dev/null
+++ b/recipes/netpbm/netpbm-10.28/libgnuhash.patch
@@ -0,0 +1,12 @@
+diff -urN netpbm-10.28.old/lib/Makefile netpbm-10.28/lib/Makefile
+--- netpbm-10.28.old/lib/Makefile 2005-02-05 18:47:27.000000000 +0000
++++ netpbm-10.28/lib/Makefile 2009-05-12 13:33:10.000000000 +0100
+@@ -111,7 +111,7 @@
+ rm -f $@
+ $(SYMLINK) $< $@
+ libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
+- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
++ $(LD) $(LDFLAGS) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
+ $(SHLIB_CLIB) $(LADD)
+ endif
+
diff --git a/recipes/netpbm/netpbm_10.28.bb b/recipes/netpbm/netpbm_10.28.bb
index 8469074fbd..2672e4a904 100644
--- a/recipes/netpbm/netpbm_10.28.bb
+++ b/recipes/netpbm/netpbm_10.28.bb
@@ -25,10 +25,11 @@ RDEPENDS = "perl\
RDEPENDS += "perl-module-exporter-heavy"
RDEPENDS += "perl-module-file-spec-unix"
-PR = "r6"
+PR = "r7"
SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \
file://ppmtojpeg.patch;patch=42 \
+ file://libgnuhash.patch;patch=1 \
file://Makefile.config \
file://oeendiangen"