diff options
author | adam <adam@pkgsrc.org> | 2017-07-05 10:17:01 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2017-07-05 10:17:01 +0000 |
commit | 16550bf29ecb7dc1f24f36b176c8fba22cce5117 (patch) | |
tree | d92f2e3366d17b158a5e48563f16da19624c8617 /lang/gcc7 | |
parent | 37ad7486d45b3cdaa72dab675c9dbbec08d47a86 (diff) | |
download | pkgsrc-16550bf29ecb7dc1f24f36b176c8fba22cce5117.tar.gz |
On Darwin you must not have duplicate symbols
Diffstat (limited to 'lang/gcc7')
-rw-r--r-- | lang/gcc7/distinfo | 4 | ||||
-rw-r--r-- | lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lang/gcc7/distinfo b/lang/gcc7/distinfo index 66ff62d481e..4d44f4c4ded 100644 --- a/lang/gcc7/distinfo +++ b/lang/gcc7/distinfo @@ -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) = b25632587d9fbe8ff38377fe34cb16225355 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 diff --git a/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h b/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h index cc0ef3624e0..0c021a501b5 100644 --- a/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h +++ b/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h @@ -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 #65612 }; -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 |