Fri Sep 30 17:17:37 2016 UTC ()
Remove the whitespace between $(LINKER_RPATH_FLAG) and the path.
Otherwise the flag may be misinterpreted by linker (e.g. Apple's ld).


(sevan)
diff -r1.3 -r1.4 pkgsrc/lang/gcc6/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/gcc6/patches/patch-gcc_Makefile.in
cvs diff -r1.3 -r1.4 pkgsrc/lang/gcc6/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/gcc6/distinfo 2016/09/28 17:13:16 1.3
+++ pkgsrc/lang/gcc6/distinfo 2016/09/30 17:17:37 1.4
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.3 2016/09/28 17:13:16 maya Exp $ 1$NetBSD: distinfo,v 1.4 2016/09/30 17:17:37 sevan Exp $
2 2
3SHA1 (gcc-6.2.0.tar.bz2) = 583e29c7fe69d9a1031a89752c2551ab5aeacb91 3SHA1 (gcc-6.2.0.tar.bz2) = 583e29c7fe69d9a1031a89752c2551ab5aeacb91
4RMD160 (gcc-6.2.0.tar.bz2) = d9154ca51f40ae3ce42950a0476f701a9f86fc95 4RMD160 (gcc-6.2.0.tar.bz2) = d9154ca51f40ae3ce42950a0476f701a9f86fc95
5SHA512 (gcc-6.2.0.tar.bz2) = 1e8b826a3d44b9d5899309894e20c03abeb352bf3d273b8ad63af814c0ee2911f1a83ce1cd4cdd2d1cb0b3e3c34e9b7ae1b2ab83dfc649ee817ab05247c76198 5SHA512 (gcc-6.2.0.tar.bz2) = 1e8b826a3d44b9d5899309894e20c03abeb352bf3d273b8ad63af814c0ee2911f1a83ce1cd4cdd2d1cb0b3e3c34e9b7ae1b2ab83dfc649ee817ab05247c76198
6Size (gcc-6.2.0.tar.bz2) = 99778648 bytes 6Size (gcc-6.2.0.tar.bz2) = 99778648 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) = ce366a091960d335ecb022918e2f7bfc4e3fcccf 11SHA1 (patch-gcc_Makefile.in) = 41d45e8988b59e6ffa7adb7833290d39fc1fd0e1
12SHA1 (patch-gcc_config.gcc) = 84fedf863c853c40bf81884f5db3617200f0d31d 12SHA1 (patch-gcc_config.gcc) = 84fedf863c853c40bf81884f5db3617200f0d31d
13SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633 13SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
14SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550 14SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
15SHA1 (patch-gcc_config_netbsd.c) = 3c09521e1803633a3643cf396a03f1f433ec869b 15SHA1 (patch-gcc_config_netbsd.c) = 3c09521e1803633a3643cf396a03f1f433ec869b
16SHA1 (patch-gcc_config_netbsd.h) = 81891a83bb17b99fdb2c9381b8e8a1767391c695 16SHA1 (patch-gcc_config_netbsd.h) = 81891a83bb17b99fdb2c9381b8e8a1767391c695
17SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846 17SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
18SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3 18SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
19SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d 19SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d
20SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b 20SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
21SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b 21SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b
22SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783 22SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
23SHA1 (patch-libcilkrts_configure) = 0d88069173cba34158f5b6b91d2d12ca81b0300c 23SHA1 (patch-libcilkrts_configure) = 0d88069173cba34158f5b6b91d2d12ca81b0300c
24SHA1 (patch-libcilkrts_runtime_os-unix.c) = 653c5e3486d09bddae6a384edc2a3b3f2c95f74b 24SHA1 (patch-libcilkrts_runtime_os-unix.c) = 653c5e3486d09bddae6a384edc2a3b3f2c95f74b
cvs diff -r1.1 -r1.2 pkgsrc/lang/gcc6/patches/patch-gcc_Makefile.in (expand / switch to unified diff)

--- pkgsrc/lang/gcc6/patches/patch-gcc_Makefile.in 2016/09/12 22:13:54 1.1
+++ pkgsrc/lang/gcc6/patches/patch-gcc_Makefile.in 2016/09/30 17:17:37 1.2
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: patch-gcc_Makefile.in,v 1.1 2016/09/12 22:13:54 maya Exp $ 1$NetBSD: patch-gcc_Makefile.in,v 1.2 2016/09/30 17:17:37 sevan Exp $
2 2
3Add gcc libdir to a programs rpath so that _this gcc's_ support libraries 3Add gcc libdir to a programs rpath so that _this gcc's_ support libraries
4are found. 4are found. Note that there must not be a whitespace between
 5$(LINKER_RPATH_FLAG) and the path. Otherwise the flag may be
 6misinterpreted by linker (e.g. Apple's ld).
5 7
6--- gcc/Makefile.in.orig 2013-03-05 09:46:34.000000000 +0000 8--- gcc/Makefile.in.orig 2013-03-05 09:46:34.000000000 +0000
7+++ gcc/Makefile.in 9+++ gcc/Makefile.in
8@@ -2027,6 +2027,7 @@ prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_ 10@@ -2027,6 +2027,7 @@ prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_
9 # Language-independent files. 11 # Language-independent files.
10  12
11 DRIVER_DEFINES = \ 13 DRIVER_DEFINES = \
12+ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(prefix)/@GCC_TARGET_MACHINE@/lib/%M $(LINKER_RPATH_FLAG) $(libdir)/%M \"" \ 14+ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG)$(prefix)/@GCC_TARGET_MACHINE@/lib/%M $(LINKER_RPATH_FLAG)$(libdir)/%M \"" \
13 -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ 15 -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
14 -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \ 16 -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
15 -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \ 17 -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \