[pkgsrc/trunk]: pkgsrc/mk We need the full path to the libtool that needs to ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b84520d9da5c
branches:  trunk
changeset: 467963:b84520d9da5c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 09 01:30:59 2004 +0000

description:
We need the full path to the libtool that needs to be invoked when we
use LIBTOOL_OVERRIDE.  In the buildlink[23] case, that is supposed to be
the one in ${BUILDLINK_DIR}.  Create new private variables _LIBTOOL and
_SHLIBTOOL to hold these paths.

diffstat:

 mk/bsd.pkg.mk                   |  17 +++++++++++++----
 mk/buildlink2/bsd.buildlink2.mk |   6 +++++-
 mk/buildlink3/bsd.buildlink3.mk |   6 +++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diffs (94 lines):

diff -r 161e4b2eaf77 -r b84520d9da5c mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Feb 09 01:29:29 2004 +0000
+++ b/mk/bsd.pkg.mk     Mon Feb 09 01:30:59 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1380 2004/02/08 10:39:35 seb Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1381 2004/02/09 01:30:59 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -367,8 +367,17 @@
 .else
 LIBTOOL_REQD?=         1.4.20010614nb11
 .endif
+#
+# PKG_LIBTOOL is the path to the libtool script installed by libtool-base.
+# _LIBTOOL is the path the libtool used by the build, which could be the
+#      path to a libtool warpper script.
+# LIBTOOL is the publicly-readable variable that should be used by
+#      Makefiles to invoke the proper libtool.
+#
 PKG_LIBTOOL?=          ${LOCALBASE}/bin/libtool
 PKG_SHLIBTOOL?=                ${LOCALBASE}/bin/shlibtool
+_LIBTOOL?=             ${PKG_LIBTOOL}
+_SHLIBTOOL?=           ${PKG_SHLIBTOOL}
 LIBTOOL?=              ${PKG_LIBTOOL}
 SHLIBTOOL?=            ${PKG_SHLIBTOOL}
 .if defined(USE_LIBTOOL)
@@ -2308,7 +2317,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        if [ -f ${ltconfig} ]; then                                     \
                ${RM} -f ${ltconfig};                                   \
-               ${ECHO} "${RM} -f libtool; ${LN} -s ${PKG_LIBTOOL} libtool" \
+               ${ECHO} "${RM} -f libtool; ${LN} -s ${_LIBTOOL} libtool" \
                        > ${ltconfig};                                  \
                ${CHMOD} +x ${ltconfig};                                \
        fi
@@ -2385,7 +2394,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        if [ -f ${libtool} ]; then                                      \
                (${ECHO} '#!${CONFIG_SHELL}';                           \
-                ${ECHO} 'exec ${PKG_LIBTOOL} "$$@"';                   \
+                ${ECHO} 'exec ${_LIBTOOL} "$$@"';                      \
                ) > ${libtool}.override;                                \
                if [ -x ${libtool} ]; then                              \
                        ${CHMOD} +x ${libtool}.override;                \
@@ -2399,7 +2408,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        if [ -f ${libtool} ]; then                                      \
                ${RM} -f ${libtool};                                    \
-               ${LN} -sf ${PKG_SHLIBTOOL} ${libtool};                  \
+               ${LN} -sf ${_SHLIBTOOL} ${libtool};                     \
        fi
 .    endfor
 .  endif
diff -r 161e4b2eaf77 -r b84520d9da5c mk/buildlink2/bsd.buildlink2.mk
--- a/mk/buildlink2/bsd.buildlink2.mk   Mon Feb 09 01:29:29 2004 +0000
+++ b/mk/buildlink2/bsd.buildlink2.mk   Mon Feb 09 01:30:59 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.113 2004/02/08 02:59:14 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.114 2004/02/09 01:30:59 jlam Exp $
 #
 # An example package buildlink2.mk file:
 #
@@ -480,6 +480,10 @@
 _BLNK_WRAPPEES+=       FC
 .endif
 _BLNK_WRAPPEES+=       LIBTOOL SHLIBTOOL
+.if defined(USE_LIBTOOL)
+_LIBTOOL=              ${BUILDLINK_LIBTOOL}
+_SHLIBTOOL=            ${BUILDLINK_SHLIBTOOL}
+.endif
 .if defined(USE_X11)
 IMAKE?=                        ${X11BASE}/bin/imake
 _BLNK_WRAPPEES+=       IMAKE
diff -r 161e4b2eaf77 -r b84520d9da5c mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Mon Feb 09 01:29:29 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Mon Feb 09 01:30:59 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.79 2004/02/08 02:59:14 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.80 2004/02/09 01:30:59 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -955,6 +955,10 @@
 _BLNK_WRAPPEES+=       FC
 .endif
 _BLNK_WRAPPEES+=       LIBTOOL SHLIBTOOL
+.if defined(USE_LIBTOOL)
+_LIBTOOL=              ${BUILDLINK_LIBTOOL}
+_SHLIBTOOL=            ${BUILDLINK_SHLIBTOOL}
+.endif
 .if defined(USE_X11)
 IMAKE?=                        ${X11BASE}/bin/imake
 _BLNK_WRAPPEES+=       IMAKE