diff options
| author | maya <maya@pkgsrc.org> | 2016-09-28 14:39:00 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2016-09-28 14:39:00 +0000 |
| commit | 088aad3304383ccaae75bead536ea590d569ec28 (patch) | |
| tree | 2d83d2c78e6618776c1886ccb6bedf0f99762817 /lang/gcc5 | |
| parent | 4dc5ea5dca1f91dddc8656d169896dcb277a8654 (diff) | |
| download | pkgsrc-088aad3304383ccaae75bead536ea590d569ec28.tar.gz | |
lang/gcc{5,6}: avoid overwriting previous extra_objs in gcc/config.gcc
No change for i386/amd64, but arm needs additional extra_objs to build.
Mistake was in a netbsd-specific part of configure as well.
Thanks to Richard Earnshaw and ktkachov at GCC for finding the problem.
Diffstat (limited to 'lang/gcc5')
| -rw-r--r-- | lang/gcc5/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc5/patches/patch-gcc_config.gcc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lang/gcc5/distinfo b/lang/gcc5/distinfo index e3bdf89c2e1..1948a67988f 100644 --- a/lang/gcc5/distinfo +++ b/lang/gcc5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2016/09/06 05:08:48 maya Exp $ +$NetBSD: distinfo,v 1.12 2016/09/28 14:39:00 maya Exp $ SHA1 (gcc-5.4.0.tar.bz2) = 07524df2b4ab9070bad9c49ab668da72237b8115 RMD160 (gcc-5.4.0.tar.bz2) = 7ae3413ca7e90bb21e65e637c02ddf2b675b45f4 @@ -9,7 +9,7 @@ RMD160 (isl-0.14.tar.bz2) = 4c69d026b51561bc1948cb7db79331b78a9d2c39 SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7 Size (isl-0.14.tar.bz2) = 1399896 bytes SHA1 (patch-gcc_Makefile.in) = b2bceb34537de1cf704f18a59aa4e4d4a4551c62 -SHA1 (patch-gcc_config.gcc) = bfa3897de6afa573ee44a60973611c4e9024f497 +SHA1 (patch-gcc_config.gcc) = 84fedf863c853c40bf81884f5db3617200f0d31d SHA1 (patch-gcc_config.host) = 1b1e11cd199eb93f49443d51c0063b09b7327858 SHA1 (patch-gcc_config_host-netbsd.c) = 765295f07edb8a68f1910e3a9b4dd2a7dcd491a5 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633 diff --git a/lang/gcc5/patches/patch-gcc_config.gcc b/lang/gcc5/patches/patch-gcc_config.gcc index 8aad48ec3bb..d7fb534e64d 100644 --- a/lang/gcc5/patches/patch-gcc_config.gcc +++ b/lang/gcc5/patches/patch-gcc_config.gcc @@ -1,4 +1,4 @@ -$NetBSD: patch-gcc_config.gcc,v 1.1 2015/07/16 12:03:36 ryoon Exp $ +$NetBSD: patch-gcc_config.gcc,v 1.2 2016/09/28 14:39:00 maya Exp $ --- gcc/config.gcc.orig 2014-11-21 16:04:20.000000000 +0000 +++ gcc/config.gcc @@ -14,8 +14,8 @@ $NetBSD: patch-gcc_config.gcc,v 1.1 2015/07/16 12:03:36 ryoon Exp $ + # cabs/cabsf are renamed to __c99_cabs/cabsf + tm_p_file="${tm_p_file} netbsd-protos.h" -+ target_gtfiles="\$(srcdir)/config/netbsd.c" -+ extra_objs="netbsd.o" ++ target_gtfiles="${target_gtfiles} \$(srcdir)/config/netbsd.c" ++ extra_objs="${extra_objs} netbsd.o" + # NetBSD 2.0 and later get POSIX threads enabled by default. # Allow them to be explicitly enabled on any other version. |