pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/tcl install-sh requires that $SHELL is an extreme...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c3f57ac8cacf
branches:  trunk
changeset: 365661:c3f57ac8cacf
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Sat Jul 22 23:40:07 2017 +0000

description:
install-sh requires that $SHELL is an extremely close match to /bin/sh.

The install would presumably fail outright for user shells like tcsh, so we
need to set SHELL regardless.  But technically install-sh has a quoting bug
in the exit trap, which even results in SHELL=zsh failing.

diffstat:

 lang/tcl/Makefile |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r d41ea25c0608 -r c3f57ac8cacf lang/tcl/Makefile
--- a/lang/tcl/Makefile Sat Jul 22 19:32:40 2017 +0000
+++ b/lang/tcl/Makefile Sat Jul 22 23:40:07 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2017/04/22 21:03:41 adam Exp $
+# $NetBSD: Makefile,v 1.96 2017/07/22 23:40:07 dsainty Exp $
 
 DISTNAME=      tcl${TCL_VERSION}-src
 PKGNAME=       tcl-${TCL_VERSION}
@@ -55,6 +55,9 @@
 SUBST_FILES.sqllink=   pkgs/sqlite3.13.0/configure
 SUBST_SED.sqllink=     -e "/LIBS=/s|-lsqlite3|-L${BUILDLINK_PREFIX.sqlite3}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib -lsqlite3|g"
 
+# install-sh requires $SHELL is an extremely close match to /bin/sh
+MAKE_ENV+=             SHELL=${SH:Q}
+
 .if ${OPSYS} == "Darwin"
 post-build:
 .  for lib in itcl${ITCL_VERSION}/libitcl${ITCL_VERSION}.dylib \



Home | Main Index | Thread Index | Old Index