diff options
| author | tv <tv@pkgsrc.org> | 2004-11-12 02:05:20 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-11-12 02:05:20 +0000 |
| commit | 5a85ebf2087c193c93ccb5db7b25cd8cdf2bbefc (patch) | |
| tree | 17ed56c35972a86343ddde869c10835168d8888e | |
| parent | 9da5eee697331772d167a64d57f5d3fa7b49aa31 (diff) | |
| download | pkgsrc-5a85ebf2087c193c93ccb5db7b25cd8cdf2bbefc.tar.gz | |
Well, the double libtool BUILD_DEPENDS is already annoying people and I'd
rather not force BUILD_DEPENDS through the (slow) reduce-depends dance, so
resurrect LIBTOOL_REQD (though in a bit more succinct manner).
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 7954d77dcda..efde626582f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1533 2004/11/11 22:34:12 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1534 2004/11/12 02:05:20 tv Exp $ # # This file is in the public domain. # @@ -401,10 +401,8 @@ _SHLIBTOOL?= ${PKG_SHLIBTOOL} LIBTOOL?= ${PKG_LIBTOOL} SHLIBTOOL?= ${PKG_SHLIBTOOL} .if defined(USE_LIBTOOL) -.if defined(_OPSYS_LIBTOOL_REQD) -BUILD_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD}:../../devel/libtool-base -.endif -BUILD_DEPENDS+= libtool-base>=1.5.10nb1:../../devel/libtool-base +LIBTOOL_REQD?= 1.5.10nb1 +BUILD_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" LIBTOOL_OVERRIDE?= libtool */libtool */*/libtool |