CVS commit: pkgsrc/lang/gcc7

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jul  5 10:17:01 UTC 2017

Modified Files:
        pkgsrc/lang/gcc7: distinfo
        pkgsrc/lang/gcc7/patches: patch-libgcc_config_i386_cpuinfo.h

Log Message:
On Darwin you must not have duplicate symbols


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc7/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h

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/distinfo
diff -u pkgsrc/lang/gcc7/distinfo:1.5 pkgsrc/lang/gcc7/distinfo:1.6
--- pkgsrc/lang/gcc7/distinfo:1.5       Sun May 14 02:38:02 2017
+++ pkgsrc/lang/gcc7/distinfo   Wed Jul  5 10:17:01 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2017/05/14 02:38:02 maya Exp $
+$NetBSD: distinfo,v 1.6 2017/07/05 10:17:01 adam Exp $
 
 SHA1 (gcc-7.1.0.tar.bz2) = 9f1e907f27eadefe7d5f7567c09e17805d9c8837
 RMD160 (gcc-7.1.0.tar.bz2) = a228dc45a09eda91b1a201d234f9013b3009b461
@@ -27,7 +27,7 @@ SHA1 (patch-libcilkrts_runtime_os-unix.c
 SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762
 SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e30633699dd145f
-SHA1 (patch-libgcc_config_i386_cpuinfo.h) = b0ff2ab74f57a1a7368da0805c1d1e06a4eeea6d
+SHA1 (patch-libgcc_config_i386_cpuinfo.h) = d217e3c65178c96c7314cb88c740b9586d4e8fed
 SHA1 (patch-libgcc_crtstuff.c) = e3a3b02a26229992851f195b5701cb1b86c29efe
 SHA1 (patch-libgfortran_configure) = 869a60fd08edecf18a42732dcbf226bad1309394
 SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3

Index: pkgsrc/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h
diff -u pkgsrc/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h:1.2 pkgsrc/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h:1.3
--- pkgsrc/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h:1.2     Sun May 14 02:38:03 2017
+++ pkgsrc/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h Wed Jul  5 10:17:01 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-libgcc_config_i386_cpuinfo.h,v 1.2 2017/05/14 02:38:03 maya Exp $
+$NetBSD: patch-libgcc_config_i386_cpuinfo.h,v 1.3 2017/07/05 10:17:01 adam Exp $
 
 ifdef out extern for GCC bug #80600, with the same condition as
 cpuinfo.c. removing triggers GCC bug #65612
@@ -10,7 +10,7 @@ cpuinfo.c. removing triggers GCC bug #65
  };
  
 -extern struct __processor_model
-+#if defined SHARED && defined USE_ELF_SYMVER
++#if defined(__APPLE__) || (defined SHARED && defined USE_ELF_SYMVER)
 +extern
 +#endif
 +struct __processor_model