diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-07-20 10:23:35 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-07-20 10:23:35 +0000 |
| commit | cf05224a5b218231632d7df35cd4c0497c8d5165 (patch) | |
| tree | 1ca9ab81ca83542ec0280cd44982a6a6177f06ff | |
| parent | fb8fa62788c2de62c0092f71713e95739f363f3b (diff) | |
| download | pkgsrc-cf05224a5b218231632d7df35cd4c0497c8d5165.tar.gz | |
Ensure secondary configure scripts are executed with the correct shell, fixes
issues seen since the RELRO patches caused by broken ksh on SunOS.
| -rw-r--r-- | lang/tcl/distinfo | 4 | ||||
| -rw-r--r-- | lang/tcl/patches/patch-unix_Makefile.in | 20 |
2 files changed, 21 insertions, 3 deletions
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo index a516f58f4ee..44761c4b9ed 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.72 2017/07/16 09:06:44 wiz Exp $ +$NetBSD: distinfo,v 1.73 2017/07/20 10:23:35 jperkin Exp $ SHA1 (tcl8.6.6-src.tar.gz) = 169dd1589cad62c9fac4257c113db245da502cd0 RMD160 (tcl8.6.6-src.tar.gz) = 2386a69eb841f8af51c1b124f68e0b812a225cca @@ -17,7 +17,7 @@ SHA1 (patch-pkgs_tdbcpostgres1.0.4_configure) = 498cd28bdb53b4e9f1a25d8227bb4757 SHA1 (patch-pkgs_thread2.8.0_configure) = 2d130ac4a5cbebeb3a3aae41b8e9827d9bd57f45 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2 -SHA1 (patch-unix_Makefile.in) = 6fa60e07f21842e987bc20d23d4be82cba5bc905 +SHA1 (patch-unix_Makefile.in) = 218666b8a2a49dd1c8814abb165136363ceedbc2 SHA1 (patch-unix_configure) = 497eebc6dfa614647a400c94847f5fdb82d6e361 SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31 SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e diff --git a/lang/tcl/patches/patch-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in index 32d68594b07..2d75e671eea 100644 --- a/lang/tcl/patches/patch-unix_Makefile.in +++ b/lang/tcl/patches/patch-unix_Makefile.in @@ -1,4 +1,4 @@ -$NetBSD: patch-unix_Makefile.in,v 1.11 2016/09/03 11:58:01 adam Exp $ +$NetBSD: patch-unix_Makefile.in,v 1.12 2017/07/20 10:23:35 jperkin Exp $ Honour LDFLAGS. @@ -30,6 +30,15 @@ Honour LDFLAGS. # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ +@@ -144,7 +147,7 @@ NO_DEPRECATED_FLAGS = + + # Some versions of make, like SGI's, use the following variable to determine + # which shell to use for executing commands: +-SHELL = @MAKEFILE_SHELL@ ++#SHELL = @MAKEFILE_SHELL@ + + # Tcl used to let the configure script choose which program to use for + # installing, but there are just too many different versions of "install" @@ -189,7 +192,7 @@ DLTEST_TARGETS = dltest.marker # run-time. The first symbol is for use when creating a binary with cc, and # the second is for use when running ld directly. @@ -159,3 +168,12 @@ Honour LDFLAGS. done; # Optional target to install private headers +@@ -1725,7 +1755,7 @@ configure-packages: + mkdir -p $(PKG_DIR)/$$pkg; \ + if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \ + ( cd $(PKG_DIR)/$$pkg; \ +- $$i/configure --with-tcl=../.. \ ++ $(SHELL) $$i/configure --with-tcl=../.. \ + --with-tclinclude=$(GENERIC_DIR) \ + $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \ + --enable-shared --enable-threads; ) || exit $$?; \ |