diff options
| author | jlam <jlam@pkgsrc.org> | 2004-12-18 00:14:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-12-18 00:14:04 +0000 |
| commit | ee2ff907ec12fb7339cbc99a89b930bdd085ac71 (patch) | |
| tree | 3f08018042a9373f94f63c1059159baad79de443 /mk | |
| parent | 10b62d2962f121aa19c06425d6ca811b19152986 (diff) | |
| download | pkgsrc-ee2ff907ec12fb7339cbc99a89b930bdd085ac71.tar.gz | |
Ensure that libtool-base>=1.5.10nb7 is required for packages that set
USE_FORTRAN.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a9c71df1330..40a5ba0f180 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1547 2004/12/17 16:24:22 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1548 2004/12/18 00:14:04 jlam Exp $ # # This file is in the public domain. # @@ -336,9 +336,6 @@ MAKEFLAGS+= PERL5_ARCHLIB=${PERL5_ARCHLIB:Q} .endif # USE_PERL5 == run .if defined(USE_FORTRAN) -. if defined(USE_LIBTOOL) -LIBTOOL_REQD?= 1.5.10nb7 -. endif . if !exists(/usr/bin/f77) PKG_FC?= f2c-f77 . endif @@ -408,8 +405,13 @@ _SHLIBTOOL?= ${PKG_SHLIBTOOL} LIBTOOL?= ${PKG_LIBTOOL} SHLIBTOOL?= ${PKG_SHLIBTOOL} .if defined(USE_LIBTOOL) +. if defined(USE_FORTRAN) +LIBTOOL_REQD?= 1.5.10nb7 +BUILD_DEPENDS+= libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base +. else LIBTOOL_REQD?= 1.5.10nb1 BUILD_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base +. endif CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" LIBTOOL_OVERRIDE?= libtool */libtool */*/libtool |