Honor LDFLAGS on NetBSD. Fixes RELRO build.

Every OPSYS has its own case for this. Please fix your
favorite operating system similarly.

7 files changed, 63 insertions, 14 deletions

diff --git a/lang/tcl/patches/patch-pkgs_itcl4.0.5_configure b/lang/tcl/patches/patch-pkgs_itcl4.0.5_configure
index d9451e8fa69..67d08baceb3 100644
--- a/lang/tcl/patches/patch-pkgs_itcl4.0.5_configure
+++ b/lang/tcl/patches/patch-pkgs_itcl4.0.5_configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-pkgs_itcl4.0.5_configure,v 1.1 2016/09/03 11:58:01 adam Exp $
+$NetBSD: patch-pkgs_itcl4.0.5_configure,v 1.2 2017/07/16 08:50:18 wiz Exp $
 
 Add support for DragonFly.
+Honor LDFLAGS on NetBSD.
 
 --- pkgs/itcl4.0.5/configure.orig	2016-07-12 15:29:40.000000000 +0000
 +++ pkgs/itcl4.0.5/configure
@@ -14,7 +15,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    case "$arch" in
-@@ -7464,8 +7463,6 @@ fi
+@@ -7464,13 +7463,11 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -23,6 +24,12 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS}'
+ 	    SHLIB_SUFFIX=".so"
+ 	    LDFLAGS="$LDFLAGS -export-dynamic"
+ 	    if test $doRpath = yes; then :
 @@ -7487,7 +7484,7 @@ fi
  
  fi
diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.13.0_configure b/lang/tcl/patches/patch-pkgs_sqlite3.13.0_configure
index 20c15f8f1a8..27d2ada6727 100644
--- a/lang/tcl/patches/patch-pkgs_sqlite3.13.0_configure
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.13.0_configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-pkgs_sqlite3.13.0_configure,v 1.1 2016/09/03 11:58:01 adam Exp $
+$NetBSD: patch-pkgs_sqlite3.13.0_configure,v 1.2 2017/07/16 08:50:18 wiz Exp $
 
 Add support for DragonFly.
+Honor LDFLAGS on NetBSD.
 
 --- pkgs/sqlite3.13.0/configure.orig	2016-05-31 15:48:11.000000000 +0000
 +++ pkgs/sqlite3.13.0/configure
@@ -13,7 +14,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    case "$arch" in
-@@ -7310,8 +7310,6 @@ fi
+@@ -7310,13 +7310,11 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -22,6 +23,12 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ 	    SHLIB_SUFFIX=".so"
+ 	    LDFLAGS="$LDFLAGS -export-dynamic"
+ 	    if test $doRpath = yes; then :
 @@ -7333,7 +7331,7 @@ fi
  
  fi
diff --git a/lang/tcl/patches/patch-pkgs_tdbc1.0.4_configure b/lang/tcl/patches/patch-pkgs_tdbc1.0.4_configure
index 0721ddc3fab..1594e5ab5d2 100644
--- a/lang/tcl/patches/patch-pkgs_tdbc1.0.4_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbc1.0.4_configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-pkgs_tdbc1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-pkgs_tdbc1.0.4_configure,v 1.2 2017/07/16 08:50:18 wiz Exp $
 
 Add support for DragonFly.
+Honor LDFLAGS on NetBSD.
 
 --- pkgs/tdbc1.0.4/configure.orig	2016-01-28 18:05:47.000000000 +0000
 +++ pkgs/tdbc1.0.4/configure
@@ -14,7 +15,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    case "$arch" in
-@@ -7539,8 +7538,6 @@ fi
+@@ -7539,13 +7538,11 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -23,6 +24,12 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ 	    SHLIB_SUFFIX=".so"
+ 	    LDFLAGS="$LDFLAGS -export-dynamic"
+ 	    if test $doRpath = yes; then :
 @@ -7562,7 +7559,7 @@ fi
  
  fi
diff --git a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.4_configure b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.4_configure
index 581be9cb701..64238fa7dce 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.4_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.4_configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-pkgs_tdbcmysql1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-pkgs_tdbcmysql1.0.4_configure,v 1.2 2017/07/16 08:50:18 wiz Exp $
 
 Add support for DragonFly.
+Honor LDFLAGS on NetBSD.
 
 --- pkgs/tdbcmysql1.0.4/configure.orig	2016-01-28 18:06:23.000000000 +0000
 +++ pkgs/tdbcmysql1.0.4/configure
@@ -14,7 +15,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    case "$arch" in
-@@ -7885,8 +7884,6 @@ fi
+@@ -7885,13 +7884,11 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -23,6 +24,12 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ 	    SHLIB_SUFFIX=".so"
+ 	    LDFLAGS="$LDFLAGS -export-dynamic"
+ 	    if test $doRpath = yes; then :
 @@ -7908,7 +7905,7 @@ fi
  
  fi
diff --git a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.4_configure b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.4_configure
index 68382d44fb6..5cd3e4b0617 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.4_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.4_configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-pkgs_tdbcodbc1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-pkgs_tdbcodbc1.0.4_configure,v 1.2 2017/07/16 08:50:18 wiz Exp $
 
 Add support for DragonFly.
+Honor LDFLAGS on NetBSD.
 
 --- pkgs/tdbcodbc1.0.4/configure.orig	2016-01-28 18:06:52.000000000 +0000
 +++ pkgs/tdbcodbc1.0.4/configure
@@ -14,7 +15,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    case "$arch" in
-@@ -7885,8 +7884,6 @@ fi
+@@ -7885,13 +7884,11 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -23,6 +24,12 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ 	    SHLIB_SUFFIX=".so"
+ 	    LDFLAGS="$LDFLAGS -export-dynamic"
+ 	    if test $doRpath = yes; then :
 @@ -7908,7 +7905,7 @@ fi
  
  fi
diff --git a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.4_configure b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.4_configure
index cc7c20b8bc0..81adc303659 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.4_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.4_configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-pkgs_tdbcpostgres1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-pkgs_tdbcpostgres1.0.4_configure,v 1.2 2017/07/16 08:50:18 wiz Exp $
 
 Add support for DragonFly.
+Honor LDFLAGS on NetBSD.
 
 --- pkgs/tdbcpostgres1.0.4/configure.orig	2016-01-28 18:07:18.000000000 +0000
 +++ pkgs/tdbcpostgres1.0.4/configure
@@ -14,7 +15,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    case "$arch" in
-@@ -7885,8 +7884,6 @@ fi
+@@ -7885,13 +7884,11 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -23,6 +24,12 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ 	    SHLIB_SUFFIX=".so"
+ 	    LDFLAGS="$LDFLAGS -export-dynamic"
+ 	    if test $doRpath = yes; then :
 @@ -7908,7 +7905,7 @@ fi
  
  fi
diff --git a/lang/tcl/patches/patch-pkgs_thread2.8.0_configure b/lang/tcl/patches/patch-pkgs_thread2.8.0_configure
index dab1b522393..eebc9fbf165 100644
--- a/lang/tcl/patches/patch-pkgs_thread2.8.0_configure
+++ b/lang/tcl/patches/patch-pkgs_thread2.8.0_configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-pkgs_thread2.8.0_configure,v 1.1 2016/09/03 11:58:01 adam Exp $
+$NetBSD: patch-pkgs_thread2.8.0_configure,v 1.2 2017/07/16 08:50:18 wiz Exp $
 
 Add support for DragonFly.
+Honor LDFLAGS on NetBSD.
 
 --- pkgs/thread2.8.0/configure.orig	2016-07-05 13:37:40.000000000 +0000
 +++ pkgs/thread2.8.0/configure
@@ -13,7 +14,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    case "$arch" in
-@@ -7540,8 +7540,6 @@ fi
+@@ -7540,13 +7540,11 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -22,6 +23,12 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ 	    SHLIB_SUFFIX=".so"
+ 	    LDFLAGS="$LDFLAGS -export-dynamic"
+ 	    if test $doRpath = yes; then :
 @@ -7563,7 +7561,7 @@ fi
  
  fi