diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-08 02:59:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-08 02:59:14 +0000 |
| commit | 3f0c4ee09a7f8e9149550c82e83b658ffc55645f (patch) | |
| tree | 3985609bcb348052647ad19462700d44ee643608 /mk/bsd.pkg.mk | |
| parent | e412e3086946cdd7b1b9a1cf1ccf5bd3c63de18a (diff) | |
| download | pkgsrc-3f0c4ee09a7f8e9149550c82e83b658ffc55645f.tar.gz | |
* Let CC/CXX/CPP/FC always point to the compiler used in the actual
building of software. For packages that use either buildlink2 or
buildlink3, this would be the wrapper script in ${BUILDLINK_DIR}.
* Garbage-collect _BLNK_WRAP_SETENV.* as those are not needed after
the above changes. Configure and make processes will automatically
find the right compilers in the PATH.
* PKGLIBTOOL and PKGSHLIBTOOL are no longer needed since LIBTOOL and
SHLIBTOOL point to the correct libtools regardless of any
USE_BUILDLINK[23] definitions.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 29f2e0dcc6b..8cad504a099 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1377 2004/02/07 02:56:14 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1378 2004/02/08 02:59:14 jlam Exp $ # # This file is in the public domain. # @@ -367,14 +367,14 @@ LIBTOOL_REQD= ${_OPSYS_LIBTOOL_REQD} .else LIBTOOL_REQD?= 1.4.20010614nb11 .endif -LIBTOOL?= ${LOCALBASE}/bin/libtool -SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool +PKG_LIBTOOL?= ${LOCALBASE}/bin/libtool +PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool +LIBTOOL?= ${PKG_LIBTOOL} +SHLIBTOOL?= ${PKG_SHLIBTOOL} .if defined(USE_LIBTOOL) -PKGLIBTOOL= ${LIBTOOL} -PKGSHLIBTOOL= ${SHLIBTOOL} BUILD_DEPENDS+= libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base -CONFIGURE_ENV+= LIBTOOL="${PKGLIBTOOL} ${LIBTOOL_FLAGS}" -MAKE_ENV+= LIBTOOL="${PKGLIBTOOL} ${LIBTOOL_FLAGS}" +CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" +MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" .endif .if defined(BUILD_USES_MSGFMT) && \ @@ -2308,7 +2308,7 @@ do-ltconfig-override: ${_PKG_SILENT}${_PKG_DEBUG} \ if [ -f ${ltconfig} ]; then \ ${RM} -f ${ltconfig}; \ - ${ECHO} "${RM} -f libtool; ${LN} -s ${PKGLIBTOOL} libtool" \ + ${ECHO} "${RM} -f libtool; ${LN} -s ${LIBTOOL} libtool" \ > ${ltconfig}; \ ${CHMOD} +x ${ltconfig}; \ fi @@ -2385,7 +2385,7 @@ do-libtool-override: ${_PKG_SILENT}${_PKG_DEBUG} \ if [ -f ${libtool} ]; then \ (${ECHO} '#!${CONFIG_SHELL}'; \ - ${ECHO} 'exec ${PKGLIBTOOL} "$$@"'; \ + ${ECHO} 'exec ${LIBTOOL} "$$@"'; \ ) > ${libtool}.override; \ if [ -x ${libtool} ]; then \ ${CHMOD} +x ${libtool}.override; \ |