diff options
| author | jmmv <jmmv> | 2009-12-20 12:32:55 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2009-12-20 12:32:55 +0000 |
| commit | b64632a13f21ac8e43e7d30cf59d4924b167a547 (patch) | |
| tree | 077626e184415dc302cf816e162c5c8307ee58e3 | |
| parent | 52f9bb026c0d334817af1857d7a61196cf12fc8c (diff) | |
| download | pkgsrc-b64632a13f21ac8e43e7d30cf59d4924b167a547.tar.gz | |
Fix libtool under OS X: require a fixed version of f2c, and thus bump
PKGREVISION of libtool to 3 and require it as a dependency.
| -rw-r--r-- | devel/libtool-base/Makefile | 4 | ||||
| -rw-r--r-- | mk/bsd.pkg.use.mk | 4 | ||||
| -rw-r--r-- | mk/compiler/f2c.mk | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index 470f77a030b..0cb386320ce 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.90 2009/12/18 22:11:10 joerg Exp $ +# $NetBSD: Makefile,v 1.91 2009/12/20 12:32:55 jmmv Exp $ ########################################################################### ########################################################################### @@ -26,7 +26,7 @@ .include "../../devel/libtool/Makefile.common" PKGNAME= ${DISTNAME:S/-/-base-/} -PKGREVISION= 2 +PKGREVISION= 3 SVR4_PKGNAME= ltoob COMMENT= Generic shared library support script (the script itself) diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 42598742edf..9ed82b98d50 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.49 2009/12/16 19:48:09 joerg Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.50 2009/12/20 12:32:55 jmmv Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -97,7 +97,7 @@ _SHLIBTOOL?= ${PKG_SHLIBTOOL} LIBTOOL?= ${PKG_LIBTOOL} SHLIBTOOL?= ${PKG_SHLIBTOOL} .if defined(USE_LIBTOOL) -LIBTOOL_REQD?= 2.2.6bnb1 +LIBTOOL_REQD?= 2.2.6bnb3 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}" diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk index d288ba6eadb..9f88d1715cc 100644 --- a/mk/compiler/f2c.mk +++ b/mk/compiler/f2c.mk @@ -1,4 +1,4 @@ -# $NetBSD: f2c.mk,v 1.13 2009/12/15 17:35:36 joerg Exp $ +# $NetBSD: f2c.mk,v 1.14 2009/12/20 12:32:55 jmmv Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -88,7 +88,7 @@ PREPEND_PATH+= ${_F2C_DIR}/bin . endif # Dependencies: -BUILD_DEPENDS+= f2c>20090411:../../lang/f2c # translator +BUILD_DEPENDS+= f2c>=20090411nb2:../../lang/f2c # translator .if empty(PKGPATH:Mdevel/libtool-base) # See below . include "../../devel/libf2c/buildlink3.mk" # library |