diff options
| author | maya <maya@pkgsrc.org> | 2016-09-06 06:45:32 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2016-09-06 06:45:32 +0000 |
| commit | e87e5982ad9f2b1fb54857051c494fda22f1ee7b (patch) | |
| tree | a46197f7c835615c6192de0e26b973045ddb2724 | |
| parent | 686c4e9a90fe3e3b4d7af6dd63592003547c35b1 (diff) | |
| download | pkgsrc-e87e5982ad9f2b1fb54857051c494fda22f1ee7b.tar.gz | |
gcc47: apply upstream patch
cfns: fix mismatch in gnu_inline attributes
allows build with gcc 5 to continue further
| -rw-r--r-- | lang/gcc47/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc47/patches/patch-gcc_cp_cfns.gperf | 19 | ||||
| -rw-r--r-- | lang/gcc47/patches/patch-gcc_cp_cfns.h | 19 |
3 files changed, 41 insertions, 1 deletions
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo index 24a4807c4f1..47000f41197 100644 --- a/lang/gcc47/distinfo +++ b/lang/gcc47/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2015/11/03 22:50:35 agc Exp $ +$NetBSD: distinfo,v 1.26 2016/09/06 06:45:32 maya Exp $ SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a @@ -18,6 +18,8 @@ SHA1 (patch-gcc_config_i386_dragonfly.h) = 0d3f785434c02beb9c4561fe59842a970e8f7 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550 SHA1 (patch-gcc_config_sol2.h) = 4f6ffe871840dcf7e2e469fdcc5d327b9b00f957 SHA1 (patch-gcc_configure) = a4b670d0c54c410d38715b7a2a572a7048e3ec5e +SHA1 (patch-gcc_cp_cfns.gperf) = 8f218068e231d97e1b8936aff898c1047440b0ff +SHA1 (patch-gcc_cp_cfns.h) = 065ef7c681f229f521c845bd1357def95b7e5045 SHA1 (patch-gcc_fortran_f95-lang.c) = 6edd2adc7de0d6db36fc5670535b55f61664f5fd SHA1 (patch-gcc_gcc.c) = d28e633c8961161562db960054aaa5aa6a1ac645 SHA1 (patch-gcc_ginclude_stddef.h) = 87d7c2ff4400ad0719b2351d2f4c4b05bd257db3 diff --git a/lang/gcc47/patches/patch-gcc_cp_cfns.gperf b/lang/gcc47/patches/patch-gcc_cp_cfns.gperf new file mode 100644 index 00000000000..7a2309ca4d5 --- /dev/null +++ b/lang/gcc47/patches/patch-gcc_cp_cfns.gperf @@ -0,0 +1,19 @@ +$NetBSD: patch-gcc_cp_cfns.gperf,v 1.1 2016/09/06 06:45:32 maya Exp $ + +cfns: fix mismatch in gnu_inline attributes +https://gcc.gnu.org/ml/gcc-patches/2015-08/msg00375.html + +fixes build using gcc5 + +--- gcc/cp/cfns.gperf.orig 2009-04-21 19:03:23.000000000 +0000 ++++ gcc/cp/cfns.gperf +@@ -23,6 +23,9 @@ static unsigned int hash (const char *, + #ifdef __GNUC__ + __inline + #endif ++#ifdef __GNUC_STDC_INLINE__ ++__attribute__ ((__gnu_inline__)) ++#endif + const char * libc_name_p (const char *, unsigned int); + %} + %% diff --git a/lang/gcc47/patches/patch-gcc_cp_cfns.h b/lang/gcc47/patches/patch-gcc_cp_cfns.h new file mode 100644 index 00000000000..03e0d346bb6 --- /dev/null +++ b/lang/gcc47/patches/patch-gcc_cp_cfns.h @@ -0,0 +1,19 @@ +$NetBSD: patch-gcc_cp_cfns.h,v 1.1 2016/09/06 06:45:32 maya Exp $ + +cfns: fix mismatch in gnu_inline attributes +https://gcc.gnu.org/ml/gcc-patches/2015-08/msg00375.html + +fixes build of using gcc5. + +--- gcc/cp/cfns.h.orig 2009-04-21 19:03:23.000000000 +0000 ++++ gcc/cp/cfns.h +@@ -54,6 +54,9 @@ static unsigned int hash (const char *, + #ifdef __GNUC__ + __inline + #endif ++#ifdef __GNUC_STDC_INLINE__ ++__attribute__ ((__gnu_inline__)) ++#endif + const char * libc_name_p (const char *, unsigned int); + /* maximum key range = 391, duplicates = 0 */ + |