diff options
| author | jlam <jlam> | 2003-01-10 08:44:18 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-01-10 08:44:18 +0000 |
| commit | 9247382858046e89e8bd0c871918eb25c11d8d80 (patch) | |
| tree | 9efd9e8c8d7cabb87e4a540c9e040f9cc4940c74 /mk/buildlink2 | |
| parent | 789ec27677ebd0882c52d5da0a7146bfabfdc376 (diff) | |
| download | pkgsrc-9247382858046e89e8bd0c871918eb25c11d8d80.tar.gz | |
Install a ${PREFIX}/bin/shlibtool as part of the devel/libtool-base
package. shlibtool will not build static libraries. Add handling in
bsd.pkg.mk for a variable named "SHLIBTOOL_OVERRIDE" that is analogous to
LIBTOOL_OVERRIDE and causes any listed libtool scripts to be replaced with
a symlink to shlibtool, and teach buildlink2 about shlibtool. Bump
PKGREVISION of devel/libtool* packages to 11.
Diffstat (limited to 'mk/buildlink2')
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index e5e310230b1..7da446a7e08 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.72 2003/01/08 08:33:54 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.73 2003/01/10 08:44:21 jlam Exp $ # # An example package buildlink2.mk file: # @@ -518,8 +518,9 @@ _BLNK_WRAPPEES+= FC .endif .if defined(USE_LIBTOOL) PKGLIBTOOL= ${BUILDLINK_LIBTOOL} +PKGSHLIBTOOL= ${BUILDLINK_SHLIBTOOL} .endif -_BLNK_WRAPPEES+= LIBTOOL +_BLNK_WRAPPEES+= LIBTOOL SHLIBTOOL .if defined(USE_X11) IMAKE?= ${X11BASE}/bin/imake _BLNK_WRAPPEES+= IMAKE @@ -606,13 +607,18 @@ _BLNK_WRAP_SETENV.CPP= # empty # _BLNK_WRAP_SETENV.FC+= F77="${BUILDLINK_FC:T}" -# Don't override the default LIBTOOL setting in the environment, as -# it already correctly points to ${PKGLIBTOOL}, and don't sanitize the PATH -# because we want libtool to invoke the wrapper scripts, too. +# Don't override the default LIBTOOL and SHLIBTOOL settings in the +# environment, as they already correctly point to the correct values, and +# don't sanitize the PATH because we want libtool to invoke the wrapper +# scripts, too. # _BLNK_WRAP_SETENV.LIBTOOL= # empty _BLNK_WRAPPER_SH.LIBTOOL= ${.CURDIR}/../../mk/buildlink2/libtool.sh _BLNK_WRAP_SANITIZE_PATH.LIBTOOL= # empty +# +_BLNK_WRAP_SETENV.SHLIBTOOL= # empty +_BLNK_WRAPPER_SH.SHLIBTOOL= ${.CURDIR}/../../mk/buildlink2/libtool.sh +_BLNK_WRAP_SANITIZE_PATH.SHLIBTOOL= # empty # We need to "unbuildlinkify" any libtool archives. _BLNK_WRAP_LT_UNTRANSFORM_SED= ${_REPLACE_BUILDLINK_SED} @@ -629,6 +635,13 @@ _BLNK_WRAP_PRIVATE_CACHE.LIBTOOL= ${BUILDLINK_DIR}/bin/.libtool-cache _BLNK_WRAP_PRIVATE_POST_CACHE.LIBTOOL= ${BUILDLINK_DIR}/bin/.libtool-post-cache _BLNK_WRAP_POST_LOGIC.LIBTOOL= ${BUILDLINK_DIR}/bin/.libtool-logic +# shlibtool shares cache information with libtool. +_BLNK_WRAP_PRIVATE_PRE_CACHE.SHLIBTOOL= ${_BLNK_WRAP_PRIVATE_PRE_CACHE.LIBTOOL} +_BLNK_WRAP_PRIVATE_CACHE_ADD.SHLIBTOOL= ${_BLNK_WRAP_PRIVATE_CACHE_ADD.LIBTOOL} +_BLNK_WRAP_PRIVATE_CACHE.SHLIBTOOL= ${_BLNK_WRAP_PRIVATE_CACHE.LIBTOOL} +_BLNK_WRAP_PRIVATE_POST_CACHE.SHLIBTOOL= ${_BLNK_WRAP_PRIVATE_POST_CACHE.LIBTOOL} +_BLNK_WRAP_POST_LOGIC.SHLIBTOOL= ${_BLNK_WRAP_POST_LOGIC.LIBTOOL} + # Allow BUILDLINK_SETENV.<wrappee> to override _BLNK_WRAP_SETENV.<wrappee>. .for _wrappee_ in ${_BLNK_WRAPPEES} . if defined(BUILDLINK_SETENV.${_wrappee_}) |