CVS commit: pkgsrc/lang

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Mar  3 12:58:43 UTC 2020

Modified Files:
        pkgsrc/lang/gcc7: Makefile distinfo version.mk
        pkgsrc/lang/gcc7-libs: Makefile buildlink3.mk
        pkgsrc/lang/gcc7/patches: patch-gcc_config_darwin-driver.c

Log Message:
gcc7: updated to 7.5.0

7.5.0 is a bug-fix release.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/gcc7/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/gcc7/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc7/version.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/gcc7-libs/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc7-libs/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/gcc7/patches/patch-gcc_config_darwin-driver.c

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.26 pkgsrc/lang/gcc7/Makefile:1.27
--- pkgsrc/lang/gcc7/Makefile:1.26      Sat Jan 18 23:32:43 2020
+++ pkgsrc/lang/gcc7/Makefile   Tue Mar  3 12:58:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/01/18 23:32:43 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2020/03/03 12:58:42 adam Exp $
 
 GCC_PKGNAME=           gcc7
 .include               "version.mk"
@@ -8,7 +8,6 @@ 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=   3
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC7_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/lang/gcc7/distinfo
diff -u pkgsrc/lang/gcc7/distinfo:1.16 pkgsrc/lang/gcc7/distinfo:1.17
--- pkgsrc/lang/gcc7/distinfo:1.16      Tue Aug  6 06:16:15 2019
+++ pkgsrc/lang/gcc7/distinfo   Tue Mar  3 12:58:42 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2019/08/06 06:16:15 maya Exp $
+$NetBSD: distinfo,v 1.17 2020/03/03 12:58:42 adam Exp $
 
-SHA1 (gcc-7.4.0.tar.xz) = bf09553cfa08ae6e29dfbbd541e5c69c3cbc6c66
-RMD160 (gcc-7.4.0.tar.xz) = 77d3cdafe7df748fa484a300e9513acb3ee2c2e1
-SHA512 (gcc-7.4.0.tar.xz) = 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e
-Size (gcc-7.4.0.tar.xz) = 62601888 bytes
+SHA1 (gcc-7.5.0.tar.xz) = 9153345fa05adfa58b4759ccb9f37d09662dd101
+RMD160 (gcc-7.5.0.tar.xz) = 91d46ec088badec75f41a2ad2a0ba228a6715107
+SHA512 (gcc-7.5.0.tar.xz) = fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60
+Size (gcc-7.5.0.tar.xz) = 62783088 bytes
 SHA1 (isl-0.18.tar.bz2) = bbffc5a2b05e4f0c97e882f96c448504491dc4ed
 RMD160 (isl-0.18.tar.bz2) = e876f1049893de5be4a82a63f272f62547d455ca
 SHA512 (isl-0.18.tar.bz2) = 85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94
@@ -21,7 +21,7 @@ SHA1 (patch-gcc_config_alpha_linux.h) = 
 SHA1 (patch-gcc_config_arm_arm.h) = 92c8bff1063e153fec4454e6dea5334a42b0dad6
 SHA1 (patch-gcc_config_arm_netbsd-eabi.h) = 9c1d2148e306024e8de3bdc9802fb63b976e0e7a
 SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 80a07645fab197969b4a6f518fdc81bda7376375
-SHA1 (patch-gcc_config_darwin-driver.c) = 5479026e691fb28585b5a41e5a571be9bc2a2bcb
+SHA1 (patch-gcc_config_darwin-driver.c) = d6e59feef5f6611aabd56028ca29db5919797f88
 SHA1 (patch-gcc_config_netbsd-elf.h) = 5a9b5ef26c03bec3cd58e2f446224aa6e94a30d5
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
 SHA1 (patch-gcc_config_netbsd.h) = 662226f4491f94b641f78b1273a9047434d75aed

Index: pkgsrc/lang/gcc7/version.mk
diff -u pkgsrc/lang/gcc7/version.mk:1.5 pkgsrc/lang/gcc7/version.mk:1.6
--- pkgsrc/lang/gcc7/version.mk:1.5     Sat Jan  5 00:39:13 2019
+++ pkgsrc/lang/gcc7/version.mk Tue Mar  3 12:58:42 2020
@@ -1,2 +1,2 @@
-# $NetBSD: version.mk,v 1.5 2019/01/05 00:39:13 adam Exp $
-GCC7_DIST_VERSION:=    7.4.0
+# $NetBSD: version.mk,v 1.6 2020/03/03 12:58:42 adam Exp $
+GCC7_DIST_VERSION:=    7.5.0

Index: pkgsrc/lang/gcc7-libs/Makefile
diff -u pkgsrc/lang/gcc7-libs/Makefile:1.7 pkgsrc/lang/gcc7-libs/Makefile:1.8
--- pkgsrc/lang/gcc7-libs/Makefile:1.7  Sat Jan 18 23:32:43 2020
+++ pkgsrc/lang/gcc7-libs/Makefile      Tue Mar  3 12:58:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/01/18 23:32:43 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2020/03/03 12:58:42 adam Exp $
 
 GCC_PKGNAME=   gcc7
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -8,8 +8,8 @@ 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=   4
+## '{gcc7,gcc7-libs}>=7.5.*' pkg_add will choose gcc7-libs over gcc7.
+PKGREVISION=   1
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty

Index: pkgsrc/lang/gcc7-libs/buildlink3.mk
diff -u pkgsrc/lang/gcc7-libs/buildlink3.mk:1.2 pkgsrc/lang/gcc7-libs/buildlink3.mk:1.3
--- pkgsrc/lang/gcc7-libs/buildlink3.mk:1.2     Sat Jan  5 00:39:13 2019
+++ pkgsrc/lang/gcc7-libs/buildlink3.mk Tue Mar  3 12:58:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2019/01/05 00:39:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/03/03 12:58:42 adam Exp $
 
 BUILDLINK_TREE+=       gcc7-libs
 
@@ -6,9 +6,9 @@ BUILDLINK_TREE+=        gcc7-libs
 GCC7_LIBS_BUILDLINK3_MK:=
 
 .if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
-BUILDLINK_API_DEPENDS.gcc7-libs+=      gcc7-libs>=7.4.0
+BUILDLINK_API_DEPENDS.gcc7-libs+=      gcc7-libs>=7.5.0
 .else
-BUILDLINK_API_DEPENDS.gcc7-libs+=      {gcc7,gcc7-libs}>=7.4.0
+BUILDLINK_API_DEPENDS.gcc7-libs+=      {gcc7,gcc7-libs}>=7.5.0
 .endif
 BUILDLINK_PKGSRCDIR.gcc7-libs=         ../../lang/gcc7-libs
 BUILDLINK_DEPMETHOD.gcc7-libs?=                full

Index: pkgsrc/lang/gcc7/patches/patch-gcc_config_darwin-driver.c
diff -u pkgsrc/lang/gcc7/patches/patch-gcc_config_darwin-driver.c:1.1 pkgsrc/lang/gcc7/patches/patch-gcc_config_darwin-driver.c:1.2
--- pkgsrc/lang/gcc7/patches/patch-gcc_config_darwin-driver.c:1.1       Fri Jun 14 09:42:36 2019
+++ pkgsrc/lang/gcc7/patches/patch-gcc_config_darwin-driver.c   Tue Mar  3 12:58:42 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-gcc_config_darwin-driver.c,v 1.1 2019/06/14 09:42:36 adam Exp $
+$NetBSD: patch-gcc_config_darwin-driver.c,v 1.2 2020/03/03 12:58:42 adam Exp $
 
 Fix building on Darwin.
 
---- gcc/config/darwin-driver.c.orig    2019-05-21 21:45:22.000000000 +0000
+--- gcc/config/darwin-driver.c.orig    2020-03-03 07:12:59.000000000 +0000
 +++ gcc/config/darwin-driver.c
-@@ -27,6 +27,9 @@ along with GCC; see the file COPYING3.  
- #include "diagnostic-core.h"
+@@ -112,6 +112,9 @@ validate_macosx_version_min (const char 
+ }
  
  #ifndef CROSS_DIRECTORY_STRUCTURE
 +#ifndef _Atomic