Sun May 28 01:29:42 2017 UTC ()
gcc6: remove wip package reference. correct typo.
from Kai-Uwe Eckhardt (libcilkrts)

on netbsd, always link against libgcc, from Krister Walfridsson

bump PKGREVISION.


(maya)
diff -r1.2 -r1.3 pkgsrc/lang/gcc6/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/gcc6/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/gcc6/patches/patch-gcc_config_netbsd.h
diff -r1.1 -r1.2 pkgsrc/lang/gcc6/patches/patch-libcilkrts_configure
cvs diff -r1.2 -r1.3 pkgsrc/lang/gcc6/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc6/Makefile 2017/01/25 15:17:41 1.2
+++ pkgsrc/lang/gcc6/Makefile 2017/05/28 01:29:42 1.3
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.2 2017/01/25 15:17:41 adam Exp $ 1# $NetBSD: Makefile,v 1.3 2017/05/28 01:29:42 maya Exp $
2 2
3GCC_PKGNAME= gcc6 3GCC_PKGNAME= gcc6
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC6_DIST_VERSION} 6DISTNAME= gcc-${GCC6_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC6_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC6_DIST_VERSION}
8## When bumping the PKGREVISION of this package the PKGREVISION of 8## When bumping the PKGREVISION of this package the PKGREVISION of
9## lang/gcc6-libs needs to be bump to be at least 1 more than the 9## lang/gcc6-libs needs to be bump to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
 11PKGREVISION= 1
11CATEGORIES= lang 12CATEGORIES= lang
12MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/}
13EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
14 15
15MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
17COMMENT= The GNU Compiler Collection (GCC) - 6 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 6 Release Series
18LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
19 20
20DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
21EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
22 23
23NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
cvs diff -r1.6 -r1.7 pkgsrc/lang/gcc6/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/gcc6/distinfo 2017/05/28 01:22:38 1.6
+++ pkgsrc/lang/gcc6/distinfo 2017/05/28 01:29:42 1.7
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1$NetBSD: distinfo,v 1.6 2017/05/28 01:22:38 maya Exp $ 1$NetBSD: distinfo,v 1.7 2017/05/28 01:29:42 maya Exp $
2 2
3SHA1 (gcc-6.3.0.tar.bz2) = 928ab552666ee08eed645ff20ceb49d139205dea 3SHA1 (gcc-6.3.0.tar.bz2) = 928ab552666ee08eed645ff20ceb49d139205dea
4RMD160 (gcc-6.3.0.tar.bz2) = 38d297e66ff27786f52ccc2b3a006cd1b056b0f7 4RMD160 (gcc-6.3.0.tar.bz2) = 38d297e66ff27786f52ccc2b3a006cd1b056b0f7
5SHA512 (gcc-6.3.0.tar.bz2) = 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78 5SHA512 (gcc-6.3.0.tar.bz2) = 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
6Size (gcc-6.3.0.tar.bz2) = 99903185 bytes 6Size (gcc-6.3.0.tar.bz2) = 99903185 bytes
7SHA1 (isl-0.14.tar.bz2) = b09e25df265c97ed54002cd811d227a9a26c5f9c 7SHA1 (isl-0.14.tar.bz2) = b09e25df265c97ed54002cd811d227a9a26c5f9c
8RMD160 (isl-0.14.tar.bz2) = 4c69d026b51561bc1948cb7db79331b78a9d2c39 8RMD160 (isl-0.14.tar.bz2) = 4c69d026b51561bc1948cb7db79331b78a9d2c39
9SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7 9SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7
10Size (isl-0.14.tar.bz2) = 1399896 bytes 10Size (isl-0.14.tar.bz2) = 1399896 bytes
11SHA1 (patch-gcc_Makefile.in) = 41d45e8988b59e6ffa7adb7833290d39fc1fd0e1 11SHA1 (patch-gcc_Makefile.in) = 41d45e8988b59e6ffa7adb7833290d39fc1fd0e1
12SHA1 (patch-gcc_config.gcc) = 84fedf863c853c40bf81884f5db3617200f0d31d 12SHA1 (patch-gcc_config.gcc) = 84fedf863c853c40bf81884f5db3617200f0d31d
13SHA1 (patch-gcc_config_arm_arm.h) = e69b7f89ba245847f58253675a16749890b9d1ae 13SHA1 (patch-gcc_config_arm_arm.h) = e69b7f89ba245847f58253675a16749890b9d1ae
14SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633 14SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
15SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550 15SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
16SHA1 (patch-gcc_config_netbsd.c) = 3c09521e1803633a3643cf396a03f1f433ec869b 16SHA1 (patch-gcc_config_netbsd.c) = 3c09521e1803633a3643cf396a03f1f433ec869b
17SHA1 (patch-gcc_config_netbsd.h) = 81891a83bb17b99fdb2c9381b8e8a1767391c695 17SHA1 (patch-gcc_config_netbsd.h) = 7586993f89f43de33bd0aac674e3e48c86dfe56d
18SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846 18SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
19SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3 19SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
20SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d 20SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d
21SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b 21SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
22SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b 22SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b
23SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783 23SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
24SHA1 (patch-libcilkrts_configure) = 0d88069173cba34158f5b6b91d2d12ca81b0300c 24SHA1 (patch-libcilkrts_configure) = d8f3065bb9934c3278e5e7dc6f1c56cdf31de6b1
25SHA1 (patch-libcilkrts_runtime_os-unix.c) = 653c5e3486d09bddae6a384edc2a3b3f2c95f74b 25SHA1 (patch-libcilkrts_runtime_os-unix.c) = 653c5e3486d09bddae6a384edc2a3b3f2c95f74b
26SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762 26SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762
27SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292 27SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292
28SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e30633699dd145f 28SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e30633699dd145f
29SHA1 (patch-libgcc_crtstuff.c) = d22dd1fb4a79aed2e7c2864f0bb00bcc338b3ab8 29SHA1 (patch-libgcc_crtstuff.c) = d22dd1fb4a79aed2e7c2864f0bb00bcc338b3ab8
30SHA1 (patch-libgcc_unwind-dw2-fde-dip.c) = 9c5e1823226521d11900b4d3b92c050d3941a1f6 30SHA1 (patch-libgcc_unwind-dw2-fde-dip.c) = 9c5e1823226521d11900b4d3b92c050d3941a1f6
31SHA1 (patch-libgfortran_configure) = 869a60fd08edecf18a42732dcbf226bad1309394 31SHA1 (patch-libgfortran_configure) = 869a60fd08edecf18a42732dcbf226bad1309394
32SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3 32SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3
33SHA1 (patch-libjava_boehm.cc) = bf5564261b02523927685340f59ce8faf7f84ace 33SHA1 (patch-libjava_boehm.cc) = bf5564261b02523927685340f59ce8faf7f84ace
34SHA1 (patch-libjava_configure) = 48ea2baffe87e09dda8133d286bd9b1bfe4c3f8a 34SHA1 (patch-libjava_configure) = 48ea2baffe87e09dda8133d286bd9b1bfe4c3f8a
35SHA1 (patch-libjava_contrib_rebuild-gcj-db.in) = bb01d738fc7db05046ae37e8ade32574de1d8297 35SHA1 (patch-libjava_contrib_rebuild-gcj-db.in) = bb01d738fc7db05046ae37e8ade32574de1d8297
36SHA1 (patch-libsanitizer_configure.tgt) = 0aff54104734b2cb21090e33f9304738946ea5a0 36SHA1 (patch-libsanitizer_configure.tgt) = 0aff54104734b2cb21090e33f9304738946ea5a0
37SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 014d442c885b9c51d1a4af05205279c274a9559d 37SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 014d442c885b9c51d1a4af05205279c274a9559d
cvs diff -r1.1 -r1.2 pkgsrc/lang/gcc6/patches/patch-gcc_config_netbsd.h (expand / switch to unified diff)

--- pkgsrc/lang/gcc6/patches/patch-gcc_config_netbsd.h 2016/09/12 22:13:54 1.1
+++ pkgsrc/lang/gcc6/patches/patch-gcc_config_netbsd.h 2017/05/28 01:29:42 1.2
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: patch-gcc_config_netbsd.h,v 1.1 2016/09/12 22:13:54 maya Exp $ 1$NetBSD: patch-gcc_config_netbsd.h,v 1.2 2017/05/28 01:29:42 maya Exp $
2 2
3when using shared, link against libc 3when using shared, link against libc.
4another unexplained change` 4always link against libgcc.
 5another unexplained change.
5 6
6--- gcc/config/netbsd.h.orig 2014-01-02 22:23:26.000000000 +0000 7--- gcc/config/netbsd.h.orig 2014-01-02 22:23:26.000000000 +0000
7+++ gcc/config/netbsd.h 8+++ gcc/config/netbsd.h
8@@ -17,6 +17,9 @@ You should have received a copy of the G 9@@ -17,6 +17,9 @@ You should have received a copy of the G
9 along with GCC; see the file COPYING3. If not see 10 along with GCC; see the file COPYING3. If not see
10 <http://www.gnu.org/licenses/>. */ 11 <http://www.gnu.org/licenses/>. */
11  12
12+ 13+
13+#include "netbsd-protos.h" 14+#include "netbsd-protos.h"
14+ 15+
15 /* TARGET_OS_CPP_BUILTINS() common to all NetBSD targets. */ 16 /* TARGET_OS_CPP_BUILTINS() common to all NetBSD targets. */
16 #define NETBSD_OS_CPP_BUILTINS_COMMON() \ 17 #define NETBSD_OS_CPP_BUILTINS_COMMON() \
17 do \ 18 do \
@@ -21,23 +22,32 @@ another unexplained change` @@ -21,23 +22,32 @@ another unexplained change`
21 %{pg:-lposix_p}} \ 22 %{pg:-lposix_p}} \
22+ %{shared:-lc} \ 23+ %{shared:-lc} \
23 %{!shared: \ 24 %{!shared: \
24 %{!symbolic: \ 25 %{!symbolic: \
25 %{!p: \ 26 %{!p: \
26@@ -109,6 +113,7 @@ along with GCC; see the file COPYING3.  27@@ -109,6 +113,7 @@ along with GCC; see the file COPYING3.
27 %{!pg:-lposix}} \ 28 %{!pg:-lposix}} \
28 %{p:-lposix_p} \ 29 %{p:-lposix_p} \
29 %{pg:-lposix_p}} \ 30 %{pg:-lposix_p}} \
30+ %{shared:-lc} \ 31+ %{shared:-lc} \
31 %{!shared: \ 32 %{!shared: \
32 %{!symbolic: \ 33 %{!symbolic: \
33 %{!p: \ 34 %{!p: \
 35@@ -133,7 +138,7 @@ along with GCC; see the file COPYING3.
 36 %{p: -lgcc_p} \
 37 %{pg: -lgcc_p}}"
 38 #else
 39-#define NETBSD_LIBGCC_SPEC "%{!shared:%{!symbolic: -lgcc}}"
 40+#define NETBSD_LIBGCC_SPEC "-lgcc"
 41 #endif
 42
 43 #undef LIBGCC_SPEC
34@@ -175,3 +180,9 @@ along with GCC; see the file COPYING3.  44@@ -175,3 +180,9 @@ along with GCC; see the file COPYING3.
35  45
36 #undef WINT_TYPE 46 #undef WINT_TYPE
37 #define WINT_TYPE "int" 47 #define WINT_TYPE "int"
38+ 48+
39+#undef SUBTARGET_INIT_BUILTINS 49+#undef SUBTARGET_INIT_BUILTINS
40+#define SUBTARGET_INIT_BUILTINS \ 50+#define SUBTARGET_INIT_BUILTINS \
41+do { \ 51+do { \
42+ netbsd_patch_builtins (); \ 52+ netbsd_patch_builtins (); \
43+} while(0) 53+} while(0)
cvs diff -r1.1 -r1.2 pkgsrc/lang/gcc6/patches/patch-libcilkrts_configure (expand / switch to unified diff)

--- pkgsrc/lang/gcc6/patches/patch-libcilkrts_configure 2016/09/12 22:13:54 1.1
+++ pkgsrc/lang/gcc6/patches/patch-libcilkrts_configure 2017/05/28 01:29:42 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-libcilkrts_configure,v 1.1 2016/09/12 22:13:54 maya Exp $ 1$NetBSD: patch-libcilkrts_configure,v 1.2 2017/05/28 01:29:42 maya Exp $
2 2
3--- libcilkrts/configure.orig 2014-08-12 11:06:44.000000000 +0000 3--- libcilkrts/configure.orig 2014-08-12 11:06:44.000000000 +0000
4+++ libcilkrts/configure 4+++ libcilkrts/configure
5@@ -14519,7 +14519,7 @@ esac 5@@ -14519,7 +14519,7 @@ esac
6 CFLAGS="$save_CFLAGS" 6 CFLAGS="$save_CFLAGS"
7  7
8 if test $enable_shared = yes; then 8 if test $enable_shared = yes; then
9- link_cilkrts="-lcilkrts %{static: $LIBS}" 9- link_cilkrts="-lcilkrts %{static: $LIBS}"
10+ link_cilkrts="-rpath ${PREFIX}/gcc6snapshot/lib --as-needed -lgcc_s -lcilkrts %{static $LIBS}" 10+ link_cilkrts="-rpath ${PREFIX}/gcc6/lib --as-needed -lgcc_s -lcilkrts %{static: $LIBS}"
11 else 11 else
12 link_cilkrts="-lcilkrts $LIBS" 12 link_cilkrts="-lcilkrts $LIBS"
13 fi 13 fi