CVS commit: pkgsrc/x11/tk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul 16 11:42:59 UTC 2017

Modified Files:
        pkgsrc/x11/tk: distinfo
        pkgsrc/x11/tk/patches: patch-unix_configure

Log Message:
Honor LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/x11/tk/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/tk/patches/patch-unix_configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/tk/distinfo
diff -u pkgsrc/x11/tk/distinfo:1.48 pkgsrc/x11/tk/distinfo:1.49
--- pkgsrc/x11/tk/distinfo:1.48 Sat Sep  3 11:58:02 2016
+++ pkgsrc/x11/tk/distinfo      Sun Jul 16 11:42:59 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.48 2016/09/03 11:58:02 adam Exp $
+$NetBSD: distinfo,v 1.49 2017/07/16 11:42:59 wiz Exp $
 
 SHA1 (tk8.6.6-src.tar.gz) = 34d546496c05014349cf5edad6696c125ad4f9ea
 RMD160 (tk8.6.6-src.tar.gz) = 619c250050bf8216855ea1c646207d1d147a95b8
 SHA512 (tk8.6.6-src.tar.gz) = 223c72ab5a6f6040928c56843598b878efafab44ed4152a38e68aa2800f2c181adc50a8bf23279b7d446493eec43854920e8b649b6a34ecdf31ecc07ccc74044
 Size (tk8.6.6-src.tar.gz) = 4273737 bytes
 SHA1 (patch-unix_Makefile.in) = bfb693af19ace5386a73cebdfe09c92a356e14ea
-SHA1 (patch-unix_configure) = 05d47c85f889d53f326c7a64223e435411744771
+SHA1 (patch-unix_configure) = b29c9507b8551d3a6478c28bab38a04df8b806ac

Index: pkgsrc/x11/tk/patches/patch-unix_configure
diff -u pkgsrc/x11/tk/patches/patch-unix_configure:1.10 pkgsrc/x11/tk/patches/patch-unix_configure:1.11
--- pkgsrc/x11/tk/patches/patch-unix_configure:1.10     Sun Mar  6 11:47:49 2016
+++ pkgsrc/x11/tk/patches/patch-unix_configure  Sun Jul 16 11:42:59 2017
@@ -1,6 +1,10 @@
-$NetBSD: patch-unix_configure,v 1.10 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-unix_configure,v 1.11 2017/07/16 11:42:59 wiz Exp $
 
---- unix/configure.orig        2016-02-29 19:13:21.000000000 +0000
+Support MirBSD, DragonFly.
+Honor LDFLAGS.
+Standardize file names.
+
+--- unix/configure.orig        2016-07-26 14:07:50.000000000 +0000
 +++ unix/configure
 @@ -4388,10 +4388,10 @@ fi
      # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
@@ -33,16 +37,20 @@ $NetBSD: patch-unix_configure,v 1.10 201
                LDFLAGS="-Wl,-export-dynamic"
                ;;
            esac
-@@ -5416,7 +5416,7 @@ fi
+@@ -5412,11 +5412,10 @@ fi
+       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"
            DL_OBJS="tclLoadDl.o"
            DL_LIBS=""
 -          LDFLAGS="$LDFLAGS -export-dynamic"
-+          LDFLAGS=""
            if test $doRpath = yes; then
  
                CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5433,7 +5433,7 @@ fi
+@@ -5433,7 +5432,7 @@ fi
  fi
  
            ;;
@@ -51,7 +59,7 @@ $NetBSD: patch-unix_configure,v 1.10 201
            # This configuration from FreeBSD Ports.
            SHLIB_CFLAGS="-fPIC"
            SHLIB_LD="${CC} -shared"
-@@ -6641,7 +6641,7 @@ fi
+@@ -6641,7 +6640,7 @@ fi
            BSD/OS*) ;;
            CYGWIN_*|MINGW32_*) ;;
            IRIX*) ;;
@@ -60,7 +68,7 @@ $NetBSD: patch-unix_configure,v 1.10 201
            Darwin-*) ;;
            SCO_SV-3.2*) ;;
            *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -6662,12 +6662,12 @@ fi
+@@ -6662,12 +6661,12 @@ fi
  
      if test "$SHARED_LIB_SUFFIX" = ""; then
  
@@ -75,7 +83,7 @@ $NetBSD: patch-unix_configure,v 1.10 201
  fi
  
      DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -6683,7 +6683,11 @@ fi
+@@ -6683,7 +6682,11 @@ fi
  
  else
  
@@ -88,7 +96,7 @@ $NetBSD: patch-unix_configure,v 1.10 201
  
  fi
  
-@@ -6718,7 +6722,7 @@ else
+@@ -6718,7 +6721,7 @@ else
  
  fi
  
@@ -97,7 +105,7 @@ $NetBSD: patch-unix_configure,v 1.10 201
  
      # Define TCL_LIBS now that we know what DL_LIBS is.
      # The trick here is that we don't want to change the value of TCL_LIBS if
-@@ -9850,7 +9854,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -9850,7 +9853,7 @@ echo $ECHO_N "checking for X11 libraries
            if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
                echo "$as_me:$LINENO: result: $i" >&5
  echo "${ECHO_T}$i" >&6
@@ -106,7 +114,7 @@ $NetBSD: patch-unix_configure,v 1.10 201
                x_libraries="$i"
                break
            fi
-@@ -9859,7 +9863,7 @@ echo "${ECHO_T}$i" >&6
+@@ -9859,7 +9862,7 @@ echo "${ECHO_T}$i" >&6
        if test "$x_libraries" = ""; then
            XLIBSW=-lX11
        else
@@ -115,7 +123,7 @@ $NetBSD: patch-unix_configure,v 1.10 201
        fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -9955,11 +9959,6 @@ fi
+@@ -9955,11 +9958,6 @@ fi
  #        be replaced by spaces.
  #--------------------------------------------------------------------
  
@@ -127,7 +135,7 @@ $NetBSD: patch-unix_configure,v 1.10 201
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
  fi
-@@ -11195,14 +11194,10 @@ else
+@@ -11195,14 +11193,10 @@ else
        TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
        TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
      else
@@ -143,7 +151,7 @@ $NetBSD: patch-unix_configure,v 1.10 201
  fi
  
  #--------------------------------------------------------------------
-@@ -11214,11 +11209,7 @@ fi
+@@ -11214,11 +11208,7 @@ fi
  eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
  eval "TK_STUB_LIB_DIR=${libdir}"
  
@@ -156,7 +164,7 @@ $NetBSD: patch-unix_configure,v 1.10 201
  
  TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
  TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
-@@ -12039,6 +12030,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -12039,6 +12031,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
  s,@REZ@,$REZ,;t t
  s,@REZ_FLAGS@,$REZ_FLAGS,;t t
  s,@LTLIBOBJS@,$LTLIBOBJS,;t t