CVS commit: pkgsrc/lang

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Aug 27 06:42:30 UTC 2019

Modified Files:
        pkgsrc/lang/gcc7: Makefile
        pkgsrc/lang/gcc7-libs: Makefile

Log Message:
gcc7: Revert zlib change, it causes bootstrap issues.

It doesn't appear to be related to the failure that prompted it.  Bump
gcc7-libs twice as it had fallen behind gcc7.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/gcc7/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc7-libs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc7/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.24 pkgsrc/lang/gcc7/Makefile:1.25
--- pkgsrc/lang/gcc7/Makefile:1.24      Sun Aug 11 13:21:20 2019
+++ pkgsrc/lang/gcc7/Makefile   Tue Aug 27 06:42:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:21:20 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/08/27 06:42:30 jperkin Exp $
 
 GCC_PKGNAME=           gcc7
 .include               "version.mk"
@@ -8,7 +8,7 @@ PKGNAME=        ${GCC_PKGNAME}-${GCC7_DIST_VERS
 ## 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=   2
+PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC7_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
@@ -37,7 +37,6 @@ 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
@@ -193,7 +192,6 @@ 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"

Index: pkgsrc/lang/gcc7-libs/Makefile
diff -u pkgsrc/lang/gcc7-libs/Makefile:1.5 pkgsrc/lang/gcc7-libs/Makefile:1.6
--- pkgsrc/lang/gcc7-libs/Makefile:1.5  Tue Aug  6 14:05:05 2019
+++ pkgsrc/lang/gcc7-libs/Makefile      Tue Aug 27 06:42:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/08/06 14:05:05 maya Exp $
+# $NetBSD: Makefile,v 1.6 2019/08/27 06:42:30 jperkin Exp $
 
 GCC_PKGNAME=   gcc7
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC7_DIST
 ## 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.4.*' pkg_add will choose gcc7-libs over gcc7.
-PKGREVISION=   2
+PKGREVISION=   4
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty