Re: CVS commit: [pkgsrc-2018Q3] pkgsrc/lang

[maya%NetBSD.org@localhost]

Err... oops. How do I fix this?

On Tue, Aug 06, 2019 at 01:56:20PM +0000, Maya Rashish wrote:
> Module Name:  pkgsrc
> Committed By: maya
> Date:         Tue Aug  6 13:56:20 UTC 2019
> 
> Modified Files:
>       pkgsrc/lang/gcc7 [pkgsrc-2018Q3]: Makefile
>       pkgsrc/lang/gcc7-libs [pkgsrc-2018Q3]: Makefile
> 
> Log Message:
> 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)
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.20 -r1.20.2.1 pkgsrc/lang/gcc7/Makefile
> cvs rdiff -u -r1.3 -r1.3.2.1 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.20 pkgsrc/lang/gcc7/Makefile:1.20.2.1
> --- pkgsrc/lang/gcc7/Makefile:1.20    Wed Aug 22 09:45:20 2018
> +++ pkgsrc/lang/gcc7/Makefile Tue Aug  6 13:56:20 2019
> @@ -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_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= 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"
> 
> Index: pkgsrc/lang/gcc7-libs/Makefile
> diff -u pkgsrc/lang/gcc7-libs/Makefile:1.3 pkgsrc/lang/gcc7-libs/Makefile:1.3.2.1
> --- pkgsrc/lang/gcc7-libs/Makefile:1.3        Wed Jul 18 22:55:08 2018
> +++ pkgsrc/lang/gcc7-libs/Makefile    Tue Aug  6 13:56:20 2019
> @@ -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
>  ## 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
>