[pkgsrc/trunk]: pkgsrc/mk Make LIBTOOL_OVERRIDE more powerful by taking a lis...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/23d8fadd951f
branches:  trunk
changeset: 468500:23d8fadd951f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Feb 14 17:18:49 2004 +0000

description:
Make LIBTOOL_OVERRIDE more powerful by taking a list of shell globs
relative to ${WRKSRC}.  Also automaticslly set LIBTOOL_OVERRIDE if
USE_LIBTOOL is defined, as the vast majority of packages need both if they
need USE_LIBTOOL.  The default LIBTOOL_OVERRIDE overrides libtool scripts
up to a directory depth of 2 within ${WRKSRC}.

Note that SHLIBTOOL_OVERRIDE must still be set manually in package
Makefiles that need it; however, it's also been changed to be a list of
shell globs relative to ${WRKSRC}.

diffstat:

 mk/bsd.pkg.mk |  43 ++++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 21 deletions(-)

diffs (69 lines):

diff -r 7eed986eee41 -r 23d8fadd951f mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Feb 14 17:18:36 2004 +0000
+++ b/mk/bsd.pkg.mk     Sat Feb 14 17:18:49 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1403 2004/02/14 15:22:42 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1404 2004/02/14 17:18:49 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -405,6 +405,7 @@
 BUILD_DEPENDS+=                libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base
 CONFIGURE_ENV+=                LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 MAKE_ENV+=             LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
+LIBTOOL_OVERRIDE?=     libtool */libtool */*/libtool
 .endif
 
 .if defined(BUILD_USES_MSGFMT) && \
@@ -2429,31 +2430,31 @@
 .PHONY: do-libtool-override
 do-libtool-override:
 .  if defined(LIBTOOL_OVERRIDE)
-.    for libtool in ${LIBTOOL_OVERRIDE}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       if [ -f ${libtool} ]; then                                      \
-               (${ECHO} '#!${CONFIG_SHELL}';                           \
-                ${ECHO} 'exec ${_LIBTOOL} "$$@"';                      \
-               ) > ${libtool}.override;                                \
-               if [ -x ${libtool} ]; then                              \
-                       ${CHMOD} +x ${libtool}.override;                \
+.    for _pattern_ in ${LIBTOOL_OVERRIDE}
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};                        \
+       for file in ${_pattern_}; do                                    \
+               if [ -f "$$file" ]; then                                \
+                       ${RM} -f $$file;                                \
+                       (${ECHO} '#!${CONFIG_SHELL}';                   \
+                        ${ECHO} 'exec ${_LIBTOOL} "$$@"';              \
+                       ) > $$file;                                     \
+                       ${CHMOD} +x $$file;                             \
                fi;                                                     \
-               ${MV} -f ${libtool}.override ${libtool};                \
-       fi
+       done
 .    endfor
 .  endif
 .  if defined(SHLIBTOOL_OVERRIDE)
-.    for libtool in ${SHLIBTOOL_OVERRIDE}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       if [ -f ${libtool} ]; then                                      \
-               (${ECHO} '#!${CONFIG_SHELL}';                           \
-                ${ECHO} 'exec ${_SHLIBTOOL} "$$@"';                    \
-               ) > ${libtool}.override;                                \
-               if [ -x ${libtool} ]; then                              \
-                       ${CHMOD} +x ${libtool}.override;                \
+.    for _pattern_ in ${SHLIBTOOL_OVERRIDE}
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};                        \
+       for file in ${_pattern_}; do                                    \
+               if [ -f "$$file" ]; then                                \
+                       ${RM} -f $$file;                                \
+                       (${ECHO} '#!${CONFIG_SHELL}';                   \
+                        ${ECHO} 'exec ${_SHLIBTOOL} "$$@"';            \
+                       ) > $$file;                                     \
+                       ${CHMOD} +x $$file;                             \
                fi;                                                     \
-               ${MV} -f ${libtool}.override ${libtool};                \
-       fi
+       done
 .    endfor
 .  endif
 .endif