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 (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,189 +1,190 @@ @@ -1,189 +1,190 @@
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-*-*
24 25
25USE_LANGUAGES= c c++ 26USE_LANGUAGES= c c++
26USE_TOOLS+= gmake makeinfo sed:run tar:build 27USE_TOOLS+= gmake makeinfo sed:run tar:build
27 28
28GNU_CONFIGURE= yes 29GNU_CONFIGURE= yes
29## Build outside ${WRKSRC} 30## Build outside ${WRKSRC}
30OBJDIR= ../build 31OBJDIR= ../build
31CONFIGURE_DIRS= ${OBJDIR} 32CONFIGURE_DIRS= ${OBJDIR}
32CONFIGURE_SCRIPT= ../${DISTNAME}/configure 33CONFIGURE_SCRIPT= ../${DISTNAME}/configure
33GCC_SUBPREFIX= ${GCC_PKGNAME} 34GCC_SUBPREFIX= ${GCC_PKGNAME}
34GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 35GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
35GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 36GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
36INFO_FILES= yes 37INFO_FILES= yes
37CONFIGURE_ARGS+= --disable-libstdcxx-pch 38CONFIGURE_ARGS+= --disable-libstdcxx-pch
38 39
39UNLIMIT_RESOURCES+= datasize 40UNLIMIT_RESOURCES+= datasize
40UNLIMIT_RESOURCES+= stacksize 41UNLIMIT_RESOURCES+= stacksize
41 42
42SUBST_CLASSES+= vars 43SUBST_CLASSES+= vars
43SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars} 44SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars}
44SUBST_STAGE.vars= pre-configure 45SUBST_STAGE.vars= pre-configure
45SUBST_FILES.vars= gcc/Makefile.in 46SUBST_FILES.vars= gcc/Makefile.in
46SUBST_VARS.vars= GCC_TARGET_MACHINE 47SUBST_VARS.vars= GCC_TARGET_MACHINE
47 48
48.include "../../mk/bsd.prefs.mk" 49.include "../../mk/bsd.prefs.mk"
49 50
50LANGS= c 51LANGS= c
51 52
52# In some cases LINKER_RPATH_FLAG needs a trailing space. 53# In some cases LINKER_RPATH_FLAG needs a trailing space.
53LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /} 54LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /}
54 55
55## The Library rpath to use in end programs. 56## The Library rpath to use in end programs.
56LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} 57LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
57 58
58# The "-static-libstdc++ -static-libgcc" flags are normally added to the 59# The "-static-libstdc++ -static-libgcc" flags are normally added to the
59# boot-ldflags by configure but because we are supply the boot-ldflags 60# boot-ldflags by configure but because we are supply the boot-ldflags
60# we mash supply them. 61# we mash supply them.
61BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET} 62BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET}
62# Needed on Darwin when LDFLAGS point to a SDK 63# Needed on Darwin when LDFLAGS point to a SDK
63BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*} 64BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}
64# GCC does not understand this option; remove it, or stage build will fail 65# GCC does not understand this option; remove it, or stage build will fail
65BUILDLINK_TRANSFORM+= rm:-stdlib=libc++ 66BUILDLINK_TRANSFORM+= rm:-stdlib=libc++
66 67
67.include "options.mk" 68.include "options.mk"
68 69
69## For graphite support. 70## For graphite support.
70.if !empty(PKG_OPTIONS:Mgcc-graphite) 71.if !empty(PKG_OPTIONS:Mgcc-graphite)
71 72
72post-extract: 73post-extract:
73 ${TAR} -jxf ${DISTDIR}/${ISL14}.tar.bz2 -C ${WRKSRC} 74 ${TAR} -jxf ${DISTDIR}/${ISL14}.tar.bz2 -C ${WRKSRC}
74 ${MV} ${WRKSRC}/${ISL14} ${WRKSRC}/isl 75 ${MV} ${WRKSRC}/${ISL14} ${WRKSRC}/isl
75.endif 76.endif
76 77
77## For target librarys and libjava programs. 78## For target librarys and libjava programs.
78CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} 79CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
79 80
80CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 81CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
81CONFIGURE_ARGS+= --enable-shared 82CONFIGURE_ARGS+= --enable-shared
82CONFIGURE_ARGS+= --enable-long-long 83CONFIGURE_ARGS+= --enable-long-long
83CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 84CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
84.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) 85.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
85# on NetBSD, use the native SSP code in libc 86# on NetBSD, use the native SSP code in libc
86CONFIGURE_ARGS+= --disable-libssp 87CONFIGURE_ARGS+= --disable-libssp
87.else 88.else
88CONFIGURE_ARGS+= --enable-libssp 89CONFIGURE_ARGS+= --enable-libssp
89.endif 90.endif
90CONFIGURE_ARGS+= --enable-threads=posix 91CONFIGURE_ARGS+= --enable-threads=posix
91CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} 92CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
92 93
93# multilib on Darwin requires fat-binaries 94# multilib on Darwin requires fat-binaries
94CONFIGURE_ARGS.Darwin+= --disable-multilib 95CONFIGURE_ARGS.Darwin+= --disable-multilib
95.if !empty(OSX_SDK_PATH) 96.if !empty(OSX_SDK_PATH)
96CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH} 97CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH}
97.endif 98.endif
98CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 99CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
99CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 100CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as
100MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes 101MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes
101MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no 102MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
102MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no 103MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no
103MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no 104MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no
104MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no 105MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no
105 106
106CONFIGURE_ARGS.DragonFly+= --disable-bootstrap 107CONFIGURE_ARGS.DragonFly+= --disable-bootstrap
107 108
108.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) 109.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
109CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 110CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
110.endif 111.endif
111 112
112.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 113.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
113CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse 114CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse
114.endif 115.endif
115 116
116.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 117.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
117CONFIGURE_ARGS+= --with-dwarf2 118CONFIGURE_ARGS+= --with-dwarf2
118.endif 119.endif
119 120
120# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into 121# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
121# a binary so we need to make sure we give it the installed sed and not 122# a binary so we need to make sure we give it the installed sed and not
122# the tool wrapped one. 123# the tool wrapped one.
123MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED} 124MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
124MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} 125MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
125 126
126# Determine whether to use binutils 127# Determine whether to use binutils
127.if ${OPSYS} == "SunOS" 128.if ${OPSYS} == "SunOS"
128. if exists(/usr/sfw/bin/gobjdump) 129. if exists(/usr/sfw/bin/gobjdump)
129CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 130CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
130. endif 131. endif
131. if exists(/usr/bin/ld) 132. if exists(/usr/bin/ld)
132CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld 133CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
133. else 134. else
134CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 135CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
135. endif 136. endif
136. if exists(/usr/sfw/bin/gas) 137. if exists(/usr/sfw/bin/gas)
137CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas 138CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
138. elif exists(/usr/ccs/bin/as) 139. elif exists(/usr/ccs/bin/as)
139CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as 140CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
140. else 141. else
141BUILDLINK_DEPMETHOD.binutils= full 142BUILDLINK_DEPMETHOD.binutils= full
142. include "../../devel/binutils/buildlink3.mk" 143. include "../../devel/binutils/buildlink3.mk"
143CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas 144CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
144. endif 145. endif
145.endif 146.endif
146 147
147.if ${OS_VARIANT} == "SmartOS" 148.if ${OS_VARIANT} == "SmartOS"
148SUBST_CLASSES+= ccs 149SUBST_CLASSES+= ccs
149SUBST_STAGE.ccs= pre-configure 150SUBST_STAGE.ccs= pre-configure
150SUBST_FILES.ccs= contrib/make_sunver.pl 151SUBST_FILES.ccs= contrib/make_sunver.pl
151SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g' 152SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g'
152.endif 153.endif
153 154
154pre-configure: 155pre-configure:
155 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR} 156 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
156 157
157TEST_TARGET= -k check || ${TRUE} 158TEST_TARGET= -k check || ${TRUE}
158pre-test: 159pre-test:
159 ${RUN} \ 160 ${RUN} \
160 if runtest --version >/dev/null 2>/dev/null ; then \ 161 if runtest --version >/dev/null 2>/dev/null ; then \
161 : ; \ 162 : ; \
162 else \ 163 else \
163 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \ 164 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
164 exit 1 ; \ 165 exit 1 ; \
165 fi 166 fi
166post-test: 167post-test:
167 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \ 168 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \
168 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log 169 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
169 ${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log" 170 ${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
170 171
171post-install: 172post-install:
172 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \ 173 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
173 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc ) 174 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc )
174.if !empty(PKG_OPTIONS:Mgcc-java) 175.if !empty(PKG_OPTIONS:Mgcc-java)
175 ${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc 176 ${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc
176 ${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so 177 ${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so
177.endif 178.endif
178.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11" 179.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11"
179 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE} 180 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
180 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE} 181 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
181.endif 182.endif
182 183
183GENERATE_PLIST+= \ 184GENERATE_PLIST+= \
184 cd ${DESTDIR}${PREFIX} && \ 185 cd ${DESTDIR}${PREFIX} && \
185 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ; 186 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
186 187
187.include "../../mk/dlopen.buildlink3.mk" 188.include "../../mk/dlopen.buildlink3.mk"
188.include "../../mk/pthread.buildlink3.mk" 189.include "../../mk/pthread.buildlink3.mk"
189.include "../../mk/bsd.pkg.mk" 190.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/lang/gcc6/distinfo (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,40 +1,40 @@ @@ -1,40 +1,40 @@
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
38SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = b63c2682336c9b6f0e0d7b900d6f40ad6e7a5ec4 38SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = b63c2682336c9b6f0e0d7b900d6f40ad6e7a5ec4
39SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h) = 626fc1f9c035ac5cef30a92d525af4e778835ebf 39SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h) = 626fc1f9c035ac5cef30a92d525af4e778835ebf
40SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 9784bfa4323f8498b36565d0fea28fce69ffdbb1 40SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 9784bfa4323f8498b36565d0fea28fce69ffdbb1
cvs diff -r1.1 -r1.2 pkgsrc/lang/gcc6/patches/patch-gcc_config_netbsd.h (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,43 +1,53 @@ @@ -1,43 +1,53 @@
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 \
18@@ -96,6 +99,7 @@ along with GCC; see the file COPYING3.  19@@ -96,6 +99,7 @@ along with GCC; see the file COPYING3.
19 %{!pg:-lposix}} \ 20 %{!pg:-lposix}} \
20 %{p:-lposix_p} \ 21 %{p:-lposix_p} \
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 (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