Honor LDFLAGS. Fixes RELRO build.

3 files changed, 21 insertions, 19 deletions

diff --git a/graphics/jbigkit/distinfo b/graphics/jbigkit/distinfo
index 28dc5e744b5..1bf5cdfee34 100644
--- a/graphics/jbigkit/distinfo
+++ b/graphics/jbigkit/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 21:34:04 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/07/06 13:13:30 wiz Exp $
 
 SHA1 (jbigkit-2.1.tar.gz) = 4864646df004e8331d19f2fa103ed731fdb6c099
 RMD160 (jbigkit-2.1.tar.gz) = 71cc51fce3f65d8d9abf9ff52c29edf5469eb52f
 SHA512 (jbigkit-2.1.tar.gz) = c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
 Size (jbigkit-2.1.tar.gz) = 438710 bytes
 SHA1 (patch-Makefile) = 3b5e5814be3f361b1ce5ffdd483e4078b94c4bf6
-SHA1 (patch-aa) = 2f9d98f7cfd2ab9065edc2c36905b4416b3970cd
-SHA1 (patch-ab) = 97550e42fdc1a358f5d3fb5b33e92ea2520b0f09
+SHA1 (patch-aa) = 7786ab0be7e718549da37378588a8ba55ef8f187
+SHA1 (patch-ab) = 893a3eeb636a92199d3759255b3ebef6d646d01e
diff --git a/graphics/jbigkit/patches/patch-aa b/graphics/jbigkit/patches/patch-aa
index 5de7b0d1d4d..138a95395e2 100644
--- a/graphics/jbigkit/patches/patch-aa
+++ b/graphics/jbigkit/patches/patch-aa
@@ -1,10 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2014/04/10 12:04:16 obache Exp $
+$NetBSD: patch-aa,v 1.5 2017/07/06 13:13:30 wiz Exp $
 
 * prevent to overwrite our CC/CFLAGS settings
 * libtoolize
+* honor LDFLAGS
 
 --- libjbig/Makefile.orig	2014-03-27 18:47:15.000000000 +0000
-+++ libjbig/Makefile
++++ libjbig/Makefile	2017-07-06 13:12:02.765268063 +0000
 @@ -1,34 +1,34 @@
  # Unix makefile for the JBIG-KIT library
  
@@ -44,16 +45,16 @@ $NetBSD: patch-aa,v 1.4 2014/04/10 12:04:16 obache Exp $
 -tstcodec.o: tstcodec.c jbig.h
 -tstcodec85.o: tstcodec85.c jbig85.h
 +tstcodec: tstcodec.lo jbig.lo jbig_ar.lo
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o tstcodec tstcodec.lo jbig.lo jbig_ar.lo
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o tstcodec tstcodec.lo jbig.lo jbig_ar.lo
 +
 +tstcodec85: tstcodec85.lo jbig85.lo jbig_ar.lo
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o tstcodec85 tstcodec85.lo jbig85.lo jbig_ar.lo
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o tstcodec85 tstcodec85.lo jbig85.lo jbig_ar.lo
 +
 +libjbig.la: jbig.lo jbig_ar.lo
-+	$(LIBTOOL) --mode=link $(CC) -o libjbig.la jbig.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libjbig.la jbig.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1
 +
 +libjbig85.la: jbig85.lo jbig_ar.lo
-+	$(LIBTOOL) --mode=link $(CC) -o libjbig85.la jbig85.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libjbig85.la jbig85.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1
 +
 +jbig.lo: jbig.c jbig.h jbig_ar.h
 +jbig85.lo: jbig85.c jbig85.h jbig_ar.h
@@ -63,7 +64,7 @@ $NetBSD: patch-aa,v 1.4 2014/04/10 12:04:16 obache Exp $
  
  update-po: jbig.c jbig85.c Makefile
  	xgettext -ojbig.pot -k_ \
-@@ -43,11 +43,11 @@ analyze:
+@@ -43,11 +43,11 @@
  	clang --analyze *.c
  
  test: tstcodec tstcodec85
diff --git a/graphics/jbigkit/patches/patch-ab b/graphics/jbigkit/patches/patch-ab
index 540895756d1..4501879cbd0 100644
--- a/graphics/jbigkit/patches/patch-ab
+++ b/graphics/jbigkit/patches/patch-ab
@@ -1,10 +1,11 @@
-$NetBSD: patch-ab,v 1.5 2014/04/10 12:04:16 obache Exp $
+$NetBSD: patch-ab,v 1.6 2017/07/06 13:13:30 wiz Exp $
 
 * prevent to overwrite our CC/CFLAGS settings
 * libtoolize
+* honor LDFLAGS
 
 --- pbmtools/Makefile.orig	2014-03-27 18:47:15.000000000 +0000
-+++ pbmtools/Makefile
++++ pbmtools/Makefile	2017-07-06 13:10:32.065421108 +0000
 @@ -1,43 +1,46 @@
  # Unix makefile for the JBIG-KIT PBM tools
  
@@ -31,22 +32,22 @@ $NetBSD: patch-ab,v 1.5 2014/04/10 12:04:16 obache Exp $
 -pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
 -	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
 +pbmtojbg: pbmtojbg.lo ../libjbig/libjbig.la
-+	${LIBTOOL} --mode=link $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.lo ../libjbig/libjbig.la -R ${PREFIX}/lib
++	${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg pbmtojbg.lo ../libjbig/libjbig.la -R ${PREFIX}/lib
  
 -jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
 -	$(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
 +jbgtopbm: jbgtopbm.lo ../libjbig/libjbig.la
-+	${LIBTOOL} --mode=link $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.lo ../libjbig/libjbig.la -R ${PREFIX}/lib
++	${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm jbgtopbm.lo ../libjbig/libjbig.la -R ${PREFIX}/lib
  
 -pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a
 -	$(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85
 +pbmtojbg85: pbmtojbg85.lo ../libjbig/libjbig85.la
-+	${LIBTOOL} --mode=link $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.lo ../libjbig/libjbig85.la -R ${PREFIX}/lib
++	${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg85 pbmtojbg85.lo ../libjbig/libjbig85.la -R ${PREFIX}/lib
  
 -jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a
 -	$(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
 +jbgtopbm85: jbgtopbm85.lo ../libjbig/libjbig85.la
-+	${LIBTOOL} --mode=link $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.lo ../libjbig/libjbig85.la -R ${PREFIX}/lib
++	${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm85 jbgtopbm85.lo ../libjbig/libjbig85.la -R ${PREFIX}/lib
  
 -jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
 -pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h
@@ -71,7 +72,7 @@ $NetBSD: patch-ab,v 1.5 2014/04/10 12:04:16 obache Exp $
  
  analyze:
  	clang $(CPPFLAGS) --analyze *.c
-@@ -62,18 +65,18 @@ test82: pbmtojbg jbgtopbm
+@@ -62,18 +65,18 @@
  	make IMG=mx        "OPTIONSP=-q -Y -1"             dotest2b
  	make IMG=mx        "OPTIONSP=-Y -1"                dotest2b
  	rm -f test-*.jbg test-*.pbm test-*.pgm
@@ -96,7 +97,7 @@ $NetBSD: patch-ab,v 1.5 2014/04/10 12:04:16 obache Exp $
  	cmp ../examples/ccitt1.jbg test-ccitt1.jbg
  	rm -f test-*.jbg test-*.pbm test-*.pgm
  	@echo
-@@ -81,18 +84,18 @@ test82: pbmtojbg jbgtopbm
+@@ -81,18 +84,18 @@
  	@echo
  
  dotest1:
@@ -121,7 +122,7 @@ $NetBSD: patch-ab,v 1.5 2014/04/10 12:04:16 obache Exp $
  	cmp test-$(IMG).pgm ../examples/$(IMG).pgm
  
  test85: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 test-t82.pbm
-@@ -120,41 +123,41 @@ test85: pbmtojbg jbgtopbm pbmtojbg85 jbg
+@@ -120,41 +123,41 @@
  	@echo
  
  dotest85: test-$(IMG).pbm