CVS commit: pkgsrc/lang/gcc6

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun May 28 01:29:42 UTC 2017

Modified Files:
        pkgsrc/lang/gcc6: Makefile distinfo
        pkgsrc/lang/gcc6/patches: patch-gcc_config_netbsd.h
            patch-libcilkrts_configure

Log Message:
gcc6: remove wip package reference. correct typo.
from Kai-Uwe Eckhardt (libcilkrts)

on netbsd, always link against libgcc, from Krister Walfridsson

bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc6/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc6/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc6/patches/patch-gcc_config_netbsd.h \
    pkgsrc/lang/gcc6/patches/patch-libcilkrts_configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc6/Makefile
diff -u pkgsrc/lang/gcc6/Makefile:1.2 pkgsrc/lang/gcc6/Makefile:1.3
--- pkgsrc/lang/gcc6/Makefile:1.2       Wed Jan 25 15:17:41 2017
+++ pkgsrc/lang/gcc6/Makefile   Sun May 28 01:29:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/01/25 15:17:41 adam Exp $
+# $NetBSD: Makefile,v 1.3 2017/05/28 01:29:42 maya Exp $
 
 GCC_PKGNAME=           gcc6
 .include               "version.mk"
@@ -8,6 +8,7 @@ PKGNAME=        ${GCC_PKGNAME}-${GCC6_DIST_VERS
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc6-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/lang/gcc6/distinfo
diff -u pkgsrc/lang/gcc6/distinfo:1.6 pkgsrc/lang/gcc6/distinfo:1.7
--- pkgsrc/lang/gcc6/distinfo:1.6       Sun May 28 01:22:38 2017
+++ pkgsrc/lang/gcc6/distinfo   Sun May 28 01:29:42 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2017/05/28 01:22:38 maya Exp $
+$NetBSD: distinfo,v 1.7 2017/05/28 01:29:42 maya Exp $
 
 SHA1 (gcc-6.3.0.tar.bz2) = 928ab552666ee08eed645ff20ceb49d139205dea
 RMD160 (gcc-6.3.0.tar.bz2) = 38d297e66ff27786f52ccc2b3a006cd1b056b0f7
@@ -14,14 +14,14 @@ SHA1 (patch-gcc_config_arm_arm.h) = e69b
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
 SHA1 (patch-gcc_config_netbsd.c) = 3c09521e1803633a3643cf396a03f1f433ec869b
-SHA1 (patch-gcc_config_netbsd.h) = 81891a83bb17b99fdb2c9381b8e8a1767391c695
+SHA1 (patch-gcc_config_netbsd.h) = 7586993f89f43de33bd0aac674e3e48c86dfe56d
 SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d
 SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
 SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b
 SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
-SHA1 (patch-libcilkrts_configure) = 0d88069173cba34158f5b6b91d2d12ca81b0300c
+SHA1 (patch-libcilkrts_configure) = d8f3065bb9934c3278e5e7dc6f1c56cdf31de6b1
 SHA1 (patch-libcilkrts_runtime_os-unix.c) = 653c5e3486d09bddae6a384edc2a3b3f2c95f74b
 SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762
 SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292

Index: pkgsrc/lang/gcc6/patches/patch-gcc_config_netbsd.h
diff -u pkgsrc/lang/gcc6/patches/patch-gcc_config_netbsd.h:1.1 pkgsrc/lang/gcc6/patches/patch-gcc_config_netbsd.h:1.2
--- pkgsrc/lang/gcc6/patches/patch-gcc_config_netbsd.h:1.1      Mon Sep 12 22:13:54 2016
+++ pkgsrc/lang/gcc6/patches/patch-gcc_config_netbsd.h  Sun May 28 01:29:42 2017
@@ -1,7 +1,8 @@
-$NetBSD: patch-gcc_config_netbsd.h,v 1.1 2016/09/12 22:13:54 maya Exp $
+$NetBSD: patch-gcc_config_netbsd.h,v 1.2 2017/05/28 01:29:42 maya Exp $
 
-when using shared, link against libc
-another unexplained change`
+when using shared, link against libc.
+always link against libgcc.
+another unexplained change.
 
 --- gcc/config/netbsd.h.orig   2014-01-02 22:23:26.000000000 +0000
 +++ gcc/config/netbsd.h
@@ -31,6 +32,15 @@ another unexplained change`
     %{!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
Index: pkgsrc/lang/gcc6/patches/patch-libcilkrts_configure
diff -u pkgsrc/lang/gcc6/patches/patch-libcilkrts_configure:1.1 pkgsrc/lang/gcc6/patches/patch-libcilkrts_configure:1.2
--- pkgsrc/lang/gcc6/patches/patch-libcilkrts_configure:1.1     Mon Sep 12 22:13:54 2016
+++ pkgsrc/lang/gcc6/patches/patch-libcilkrts_configure Sun May 28 01:29:42 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-libcilkrts_configure,v 1.1 2016/09/12 22:13:54 maya Exp $
+$NetBSD: patch-libcilkrts_configure,v 1.2 2017/05/28 01:29:42 maya Exp $
 
 --- libcilkrts/configure.orig  2014-08-12 11:06:44.000000000 +0000
 +++ libcilkrts/configure
@@ -7,7 +7,7 @@ $NetBSD: patch-libcilkrts_configure,v 1.
  
  if test $enable_shared = yes; then
 -  link_cilkrts="-lcilkrts %{static: $LIBS}"
-+  link_cilkrts="-rpath ${PREFIX}/gcc6snapshot/lib --as-needed -lgcc_s -lcilkrts %{static $LIBS}"
++  link_cilkrts="-rpath ${PREFIX}/gcc6/lib --as-needed -lgcc_s -lcilkrts %{static: $LIBS}"
  else
    link_cilkrts="-lcilkrts $LIBS"
  fi