diff options
| author | maya <maya@pkgsrc.org> | 2019-08-06 13:56:20 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2019-08-06 13:56:20 +0000 |
| commit | b153aa144429b040cd67e92cb82d02832f6e0005 (patch) | |
| tree | fc175e0b2c3296d79313dc0f747d3d37ff600f70 | |
| parent | 6b575dca990d7d031ac27b52ff9609e12b091c5b (diff) | |
| download | pkgsrc-b153aa144429b040cd67e92cb82d02832f6e0005.tar.gz | |
gcc7: declare dependency on zlib, and tell gcc to use the system zlib.
this might be the cause of weird missing -lz on the latest SmartOS bulk
build, which appears to use this package.
Bump PKGREVISION.
Make sure gcc7-libs PKGREVISION > gcc7 PKGREVISION
(This was not the case before)
| -rw-r--r-- | lang/gcc7-libs/Makefile | 4 | ||||
| -rw-r--r-- | lang/gcc7/Makefile | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lang/gcc7-libs/Makefile b/lang/gcc7-libs/Makefile index 3791b0d4cc7..b03c4131fd7 100644 --- a/lang/gcc7-libs/Makefile +++ b/lang/gcc7-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2018/07/18 22:55:08 maya Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2019/08/06 13:56:20 maya Exp $ GCC_PKGNAME= gcc7 .include "../../lang/${GCC_PKGNAME}/version.mk" @@ -9,7 +9,7 @@ PKGNAME= ${GCC_PKGNAME}-libs-${GCC7_DIST_VERSION} ## The PKGREVISION of this package needs to be at least 1 more than the ## PKGREVISION of the lang/gcc7 package so that with the dependence pattern ## '{gcc7,gcc7-libs}>=7.3.*' pkg_add will choose gcc7-libs over gcc7. -PKGREVISION= 4 +PKGREVISION= 6 CATEGORIES= lang MASTER_SITES= # empty diff --git a/lang/gcc7/Makefile b/lang/gcc7/Makefile index a96e503d7fc..46b2d64628d 100644 --- a/lang/gcc7/Makefile +++ b/lang/gcc7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2018/08/22 09:45:20 wiz Exp $ +# $NetBSD: Makefile,v 1.20.2.1 2019/08/06 13:56:20 maya Exp $ GCC_PKGNAME= gcc7 .include "version.mk" @@ -8,7 +8,7 @@ PKGNAME= ${GCC_PKGNAME}-${GCC7_DIST_VERSION} ## When bumping the PKGREVISION of this package the PKGREVISION of ## lang/gcc7-libs needs to be bump to be at least 1 more than the ## PKGREVISION of this package! -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7_DIST_VERSION}/} EXTRACT_SUFX= .tar.xz @@ -37,6 +37,7 @@ GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} INFO_FILES= yes CONFIGURE_ARGS+= --disable-libstdcxx-pch +CONFIGURE_ARGS+= --with-system-zlib UNLIMIT_RESOURCES+= datasize UNLIMIT_RESOURCES+= stacksize @@ -199,6 +200,7 @@ GENERATE_PLIST+= \ cd ${DESTDIR}${PREFIX} && \ ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ; +.include "../../devel/zlib/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |