diff options
| author | tron <tron@pkgsrc.org> | 2001-04-16 00:57:48 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-04-16 00:57:48 +0000 |
| commit | 70ade72ca6d167ab0017240dd5b9bbf1e4a7ec91 (patch) | |
| tree | 93f61499db1306562700b3b16ef9448bc23034a3 /devel/zlib | |
| parent | a6bb98db40fe582512d350b30d768ff0435002a9 (diff) | |
| download | pkgsrc-70ade72ca6d167ab0017240dd5b9bbf1e4a7ec91.tar.gz | |
Use direct dependence on "libtool-base" package instead of "USE_LIBTOOL"
under Solaris to avoid circular dependence.
Diffstat (limited to 'devel/zlib')
| -rw-r--r-- | devel/zlib/Makefile | 21 | ||||
| -rw-r--r-- | devel/zlib/pkg/PLIST | 5 |
2 files changed, 8 insertions, 18 deletions
diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile index 9a6d4d550ea..a5a25f8efe2 100644 --- a/devel/zlib/Makefile +++ b/devel/zlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 14:39:07 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/04/16 00:57:48 tron Exp $ DISTNAME= zlib-1.1.3 CATEGORIES= devel @@ -8,25 +8,16 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= ftp://ftp.freesoftware.com/pub/infozip/zlib/index.html COMMENT= General purpose data compression library +BUILD_DEPENDS+= libtool-base>=${LIBTOOL_VERSION}:../../devel/libtool-base + ONLY_FOR_PLATFORM= SunOS-*-* # in base NetBSD system -.include "../../mk/bsd.prefs.mk" -.if exists(${LOCALBASE}/bin/libtool) -USE_LIBTOOL= yes +LIBTOOL= ${LOCALBASE}/bin/libtool +CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" +MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKEFILE= lt.mk -PLIST_SRC= ${WRKDIR}/.PLIST_SRC post-extract: ${CP} ${FILESDIR}/lt.mk ${WRKSRC} - ${SED} \ - -e '/libz_pic.a/d' \ - -e '/libz_p.a/d' \ - <${PKGDIR}/PLIST >${PLIST_SRC} - -.else -MAKEFILE= bsd.mk -.endif - -MAKE_ENV+= NOLINT=yes .include "../../mk/bsd.pkg.mk" diff --git a/devel/zlib/pkg/PLIST b/devel/zlib/pkg/PLIST index 412537d0fa5..c81e5e3966a 100644 --- a/devel/zlib/pkg/PLIST +++ b/devel/zlib/pkg/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:34 agc Exp $ +@comment $NetBSD: PLIST,v 1.4 2001/04/16 00:57:48 tron Exp $ include/zconf.h include/zlib.h lib/libz.a -lib/libz_p.a -lib/libz_pic.a +lib/libz.la lib/libz.so lib/libz.so.0 lib/libz.so.0.1 |