diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-09 01:30:59 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-09 01:30:59 +0000 |
| commit | 83969787386f7da42dcf8e6da9d1c7c8e6828eec (patch) | |
| tree | c28873ef408e6bbcdc1eb89233277a6acd412c0f | |
| parent | 2fd59f45ed2af9d1df852571bef152792b28a02b (diff) | |
| download | pkgsrc-83969787386f7da42dcf8e6da9d1c7c8e6828eec.tar.gz | |
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.
| -rw-r--r-- | mk/bsd.pkg.mk | 17 | ||||
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 6 | ||||
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 6 |
3 files changed, 23 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index bade51bf445..31e415dad38 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ LIBTOOL_REQD= ${_OPSYS_LIBTOOL_REQD} .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 @@ do-ltconfig-override: ${_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 @@ do-libtool-override: ${_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 @@ do-libtool-override: ${_PKG_SILENT}${_PKG_DEBUG} \ if [ -f ${libtool} ]; then \ ${RM} -f ${libtool}; \ - ${LN} -sf ${PKG_SHLIBTOOL} ${libtool}; \ + ${LN} -sf ${_SHLIBTOOL} ${libtool}; \ fi . endfor . endif diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 89e99e4172e..2a32c94133c 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -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+= LD _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 --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index f7376338fbf..7337064469f 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -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+= LD _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 |