pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk When overriding libtool in the source directory, re...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a577e9bc794
branches:  trunk
changeset: 467456:4a577e9bc794
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Feb 01 01:09:09 2004 +0000

description:
When overriding libtool in the source directory, replace it with a shell
script that invokes the correct libtool instead of using a symlink.  This
fixes the problem where libtool was invoked by /bin/sh regardless of
whether libtool was built to be run by /bin/ksh instead.

diffstat:

 mk/bsd.pkg.mk |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r 9f878b6e219b -r 4a577e9bc794 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Feb 01 01:03:22 2004 +0000
+++ b/mk/bsd.pkg.mk     Sun Feb 01 01:09:09 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1367 2004/01/31 16:52:16 xtraeme Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1368 2004/02/01 01:09:09 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -2372,8 +2372,13 @@
 .    for libtool in ${LIBTOOL_OVERRIDE}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        if [ -f ${libtool} ]; then                                      \
-               ${RM} -f ${libtool};                                    \
-               ${LN} -sf ${PKGLIBTOOL} ${libtool};                     \
+               (${ECHO} '#!${CONFIG_SHELL}';                           \
+                ${ECHO} 'exec ${PKGLIBTOOL} "$$@"';                    \
+               ) > ${libtool}.override;                                \
+               if [ -x ${libtool} ]; then                              \
+                       ${CHMOD} +x ${libtool}.override;                \
+               fi;                                                     \
+               ${MV} -f ${libtool}.override ${libtool};                \
        fi
 .    endfor
 .  endif



Home | Main Index | Thread Index | Old Index