[pkgsrc/trunk]: pkgsrc/lang/gcc5 gcc5: remove wip package leftover. fix typo ...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5205d302ac66
branches:  trunk
changeset: 362854:5205d302ac66
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun May 28 01:36:11 2017 +0000

description:
gcc5: remove wip package leftover. fix typo in patch.
from Kai-Uwe Eckhardt

on netbsd, always link against libgcc.

bump PKGREVISION.

diffstat:

 lang/gcc5/Makefile                           |   4 ++--
 lang/gcc5/distinfo                           |   6 +++---
 lang/gcc5/patches/patch-gcc_config_netbsd.h  |  14 ++++++++++++--
 lang/gcc5/patches/patch-libcilkrts_configure |   4 ++--
 4 files changed, 19 insertions(+), 9 deletions(-)

diffs (87 lines):

diff -r bc21767927e8 -r 5205d302ac66 lang/gcc5/Makefile
--- a/lang/gcc5/Makefile        Sun May 28 01:30:57 2017 +0000
+++ b/lang/gcc5/Makefile        Sun May 28 01:36:11 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2017/01/25 15:17:41 adam Exp $
+# $NetBSD: Makefile,v 1.16 2017/05/28 01:36:11 maya Exp $
 
 GCC_PKGNAME=           gcc5
-PKGREVISION=           2
+PKGREVISION=           3
 .include               "version.mk"
 
 DISTNAME=      gcc-${GCC5_DIST_VERSION}
diff -r bc21767927e8 -r 5205d302ac66 lang/gcc5/distinfo
--- a/lang/gcc5/distinfo        Sun May 28 01:30:57 2017 +0000
+++ b/lang/gcc5/distinfo        Sun May 28 01:36:11 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2016/09/30 04:06:07 maya Exp $
+$NetBSD: distinfo,v 1.14 2017/05/28 01:36:11 maya Exp $
 
 SHA1 (gcc-5.4.0.tar.bz2) = 07524df2b4ab9070bad9c49ab668da72237b8115
 RMD160 (gcc-5.4.0.tar.bz2) = 7ae3413ca7e90bb21e65e637c02ddf2b675b45f4
@@ -16,14 +16,14 @@
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
 SHA1 (patch-gcc_config_netbsd.c) = 9d1327f926dece6e753093e759b5c8b707747ae1
-SHA1 (patch-gcc_config_netbsd.h) = 47e1b5d09d0529de00163ad70f47278b82a668b3
+SHA1 (patch-gcc_config_netbsd.h) = 5344f188828a0a2e85845e6f94bb372bbb3eb5c8
 SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = d6cc6a0bd257829ca2fd077a852fc447acaa63a0
 SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
 SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b
 SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
-SHA1 (patch-libcilkrts_configure) = 72a18f311d78d4b88a55441d76c10ddd85b28360
+SHA1 (patch-libcilkrts_configure) = d52de4f104bd4c7c9f200d7ce45d782cccfe73bf
 SHA1 (patch-libcilkrts_runtime_os-unix.c) = 653c5e3486d09bddae6a384edc2a3b3f2c95f74b
 SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762
 SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292
diff -r bc21767927e8 -r 5205d302ac66 lang/gcc5/patches/patch-gcc_config_netbsd.h
--- a/lang/gcc5/patches/patch-gcc_config_netbsd.h       Sun May 28 01:30:57 2017 +0000
+++ b/lang/gcc5/patches/patch-gcc_config_netbsd.h       Sun May 28 01:36:11 2017 +0000
@@ -1,7 +1,8 @@
-$NetBSD: patch-gcc_config_netbsd.h,v 1.2 2016/09/06 05:08:48 maya Exp $
+$NetBSD: patch-gcc_config_netbsd.h,v 1.3 2017/05/28 01:36:11 maya Exp $
 
 when using shared, link against libc
-another unexplained change
+always link against libgcc
+patch non-C99 cabs{,f} on netbsd
 
 --- gcc/config/netbsd.h.orig   2015-01-05 12:33:28.000000000 +0000
 +++ gcc/config/netbsd.h
@@ -31,6 +32,15 @@
     %{!shared:                 \
       %{!symbolic:             \
         %{!p:                  \
+@@ -133,7 +138,7 @@ along with GCC; see the file COPYING3.  
+      %{p: -lgcc_p}            \
+      %{pg: -lgcc_p}}"
+ #else
+-#define NETBSD_LIBGCC_SPEC "%{!shared:%{!symbolic: -lgcc}}"
++#define NETBSD_LIBGCC_SPEC "-lgcc"
+ #endif
+ 
+ #undef LIBGCC_SPEC
 @@ -175,3 +180,9 @@ along with GCC; see the file COPYING3.  
  
  #undef WINT_TYPE
diff -r bc21767927e8 -r 5205d302ac66 lang/gcc5/patches/patch-libcilkrts_configure
--- a/lang/gcc5/patches/patch-libcilkrts_configure      Sun May 28 01:30:57 2017 +0000
+++ b/lang/gcc5/patches/patch-libcilkrts_configure      Sun May 28 01:36:11 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-libcilkrts_configure,v 1.1 2015/07/16 12:03:36 ryoon Exp $
+$NetBSD: patch-libcilkrts_configure,v 1.2 2017/05/28 01:36:11 maya Exp $
 
 --- libcilkrts/configure.orig  2014-08-12 11:06:44.000000000 +0000
 +++ libcilkrts/configure
@@ -7,7 +7,7 @@
  
  if test $enable_shared = yes; then
 -  link_cilkrts="-lcilkrts %{static: $LIBS}"
-+  link_cilkrts="-rpath ${PREFIX}/gcc50snapshot/lib --as-needed -lgcc_s -lcilkrts %{static $LIBS}"
++  link_cilkrts="-rpath ${PREFIX}/gcc5/lib --as-needed -lgcc_s -lcilkrts %{static: $LIBS}"
  else
    link_cilkrts="-lcilkrts $LIBS"
  fi