diff options
| author | joerg <joerg@pkgsrc.org> | 2015-05-04 19:23:19 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-05-04 19:23:19 +0000 |
| commit | 3d10859f1abde98fdc6c93abea56f750efa1f159 (patch) | |
| tree | 89bfe39b0e3585dc0232f85cec89187986502ba8 /mk/bsd.pkg.use.mk | |
| parent | d7c43f64ab5c57194f390b08484440fc44efd11e (diff) | |
| download | pkgsrc-3d10859f1abde98fdc6c93abea56f750efa1f159.tar.gz | |
Drop _LIBTOOL and _SHLIBTOOL and make LIBTOOL and SHLIBTOOL point to the
wrapped version by full path. This fixes some cases where the wrappers
have been bypassed. lang/lua52 triggered the investigation as it failed
to link against libreadline, which should have been translated to
libedit. Tested by jperkin and myself with full bulk builds.
Diffstat (limited to 'mk/bsd.pkg.use.mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index c0e44554075..19cbdb74b2f 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.58 2014/12/30 15:13:19 wiz Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.59 2015/05/04 19:23:19 joerg Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -80,10 +80,8 @@ BUILD_DEFS+= KERBEROS # # 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 wrapper script. # LIBTOOL is the publicly-readable variable that should be used by -# Makefiles to invoke the proper libtool. +# Makefiles to invoke the proper (wrapped) libtool. # .if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran) || \ defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran77) @@ -106,10 +104,8 @@ PKG_LIBTOOL?= ${LOCALBASE}/bin/libtool PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool . endif .endif -_LIBTOOL?= ${PKG_LIBTOOL} -_SHLIBTOOL?= ${PKG_SHLIBTOOL} -LIBTOOL?= ${PKG_LIBTOOL} -SHLIBTOOL?= ${PKG_SHLIBTOOL} +LIBTOOL?= ${WRAPPER_BINDIR}/libtool +SHLIBTOOL?= ${WRAPPER_BINDIR}/shlibtool .if defined(USE_LIBTOOL) LIBTOOL_REQD?= 2.2.6bnb3 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) |