Honor LDFLAGS. Fixes RELRO build.

6 files changed, 14 insertions, 14 deletions

diff --git a/math/lp_solve/distinfo b/math/lp_solve/distinfo
index 2401691be83..3a52072d0f3 100644
--- a/math/lp_solve/distinfo
+++ b/math/lp_solve/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2016/09/08 05:12:39 richard Exp $
+$NetBSD: distinfo,v 1.6 2017/07/13 13:02:43 wiz Exp $
 
 SHA1 (lp_solve_5.5.2.3_source.tar.gz) = 867a606fcc77612b71a0a6baa5f07a273f3023a7
 RMD160 (lp_solve_5.5.2.3_source.tar.gz) = 5657c47cf996979072fb2a1135d071e48da52ea1
 SHA512 (lp_solve_5.5.2.3_source.tar.gz) = ed4c9e993e6836fdc8bae76d4ff2f48594d6f9ababbedaf83253d0e31815faa8608b110866b03a0336a7334c531efb9987ec231f8e7a62eff7efea683a1868cf
 Size (lp_solve_5.5.2.3_source.tar.gz) = 812420 bytes
 SHA1 (patch-aa) = a77ec29e056252b3b82c1a1acdd463b5ff7f6f6b
-SHA1 (patch-demo_ccc) = 6262975fdcc61e94390060425a79e8bbc5f4554b
-SHA1 (patch-lp__solve_ccc) = 122d6ba0cb00acc6abbf4826f71e29ae1beb808d
+SHA1 (patch-demo_ccc) = dd5d00bce28fa89db343489bf22f0c96d3a9894b
+SHA1 (patch-lp__solve_ccc) = a83a73f420bae7a9529bac8cf5f283651d27c80d
 SHA1 (patch-lp__utils.c) = b0774bd7b323f12c97c7bc78c26f64a75c841f34
-SHA1 (patch-lpsolve55_ccc) = 0ac4adf032b89a76ccc3f834c750c0f3885a1aa5
+SHA1 (patch-lpsolve55_ccc) = c84ba64ffaa5aa9f04701c771b644f99318bc6da
diff --git a/math/lp_solve/patches/patch-demo_ccc b/math/lp_solve/patches/patch-demo_ccc
index c4f13bfb90a..048feffe648 100644
--- a/math/lp_solve/patches/patch-demo_ccc
+++ b/math/lp_solve/patches/patch-demo_ccc
@@ -1,4 +1,4 @@
-$NetBSD: patch-demo_ccc,v 1.1 2015/12/07 17:40:27 joerg Exp $
+$NetBSD: patch-demo_ccc,v 1.2 2017/07/13 13:02:43 wiz Exp $
 
 --- demo/ccc.orig	2015-12-07 17:17:03.273655855 +0000
 +++ demo/ccc
@@ -7,4 +7,4 @@ $NetBSD: patch-demo_ccc,v 1.1 2015/12/07 17:40:27 joerg Exp $
  opts='-O3'
  
 -$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine demo.c $src -o demo $math $dl
-+$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine demo.c $src -o demo $math $DL_LDADD
++$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine demo.c $src -o demo $math $DL_LDADD $LDFLAGS
diff --git a/math/lp_solve/patches/patch-lp__solve_ccc b/math/lp_solve/patches/patch-lp__solve_ccc
index 10a70f9a539..cc1814dc92d 100644
--- a/math/lp_solve/patches/patch-lp__solve_ccc
+++ b/math/lp_solve/patches/patch-lp__solve_ccc
@@ -1,4 +1,4 @@
-$NetBSD: patch-lp__solve_ccc,v 1.2 2016/09/08 05:12:39 richard Exp $
+$NetBSD: patch-lp__solve_ccc,v 1.3 2017/07/13 13:02:43 wiz Exp $
 
 recent versions of gcc are noisy unless main() is declared returning 'int'
 and isnan() needs a floating argument else NOISNAN is defined causing
@@ -20,4 +20,4 @@ problems.
  fi
  
 -$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $dl
-+$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $DL_LDADD
++$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $DL_LDADD $LDFLAGS
diff --git a/math/lp_solve/patches/patch-lpsolve55_ccc b/math/lp_solve/patches/patch-lpsolve55_ccc
index da0f58952ec..c8a6514e9cc 100644
--- a/math/lp_solve/patches/patch-lpsolve55_ccc
+++ b/math/lp_solve/patches/patch-lpsolve55_ccc
@@ -1,4 +1,4 @@
-$NetBSD: patch-lpsolve55_ccc,v 1.2 2016/09/08 05:12:39 richard Exp $
+$NetBSD: patch-lpsolve55_ccc,v 1.3 2017/07/13 13:02:43 wiz Exp $
 
 recent versions of gcc are noisy unless main() is declared returning 'int'
 and isnan() needs a floating argument else NOISNAN is defined causing
@@ -20,7 +20,7 @@ problems.
  then
    $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
 -  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
-+  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm $DL_LDADD
++  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm $DL_LDADD $LDFLAGS
  fi
  
  rm *.o 2>/dev/null
diff --git a/misc/kchmviewer/distinfo b/misc/kchmviewer/distinfo
index 7d7afc06d65..2b35ac63fa5 100644
--- a/misc/kchmviewer/distinfo
+++ b/misc/kchmviewer/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2016/05/07 10:05:21 joerg Exp $
+$NetBSD: distinfo,v 1.15 2017/07/13 13:11:15 wiz Exp $
 
 SHA1 (kchmviewer-7.2.1.tar.gz) = 2234ae47e7915aa673cda7e31efe3569cd6c5ddc
 RMD160 (kchmviewer-7.2.1.tar.gz) = a8e5c18082eb34d9b76abe783494cdeb6bdad4ca
 SHA512 (kchmviewer-7.2.1.tar.gz) = 16e742a390ab94d3dd2537d4436cd22b90c759fb7698f0c724f2e234f26668076fba40e7c0084c0ec5360fdf213689ca2497aa069d0b52952930400113b9094b
 Size (kchmviewer-7.2.1.tar.gz) = 342665 bytes
 SHA1 (patch-po_kchmviewer_it.po) = beca7d046ed0409c2391660b12de5202160bd623
-SHA1 (patch-src_src.pro) = 05bf035ea3dc8160f570e8ec1f24dd979ddef90f
+SHA1 (patch-src_src.pro) = 0662c5b04a646bdb83cb835f04ebca81c7f8a3e6
diff --git a/misc/kchmviewer/patches/patch-src_src.pro b/misc/kchmviewer/patches/patch-src_src.pro
index d1d963ec646..44c8a0727d6 100644
--- a/misc/kchmviewer/patches/patch-src_src.pro
+++ b/misc/kchmviewer/patches/patch-src_src.pro
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_src.pro,v 1.1 2016/05/07 10:05:22 joerg Exp $
+$NetBSD: patch-src_src.pro,v 1.2 2017/07/13 13:11:15 wiz Exp $
 
 --- src/src.pro.orig	2016-05-06 18:34:34.000000000 +0000
 +++ src/src.pro
@@ -7,4 +7,4 @@ $NetBSD: patch-src_src.pro,v 1.1 2016/05/07 10:05:22 joerg Exp $
  	LIBS += -L.
  }
 +
-+QMAKE_LFLAGS += ${COMPILER_RPATH_FLAG}${X11BASE}/lib
++QMAKE_LFLAGS += ${COMPILER_RPATH_FLAG}${X11BASE}/lib ${LDFLAGS}