diff options
| author | dsainty <dsainty@pkgsrc.org> | 2012-12-12 23:44:40 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2012-12-12 23:44:40 +0000 |
| commit | fbd54c964ddceb8414bf1a7870660d387acbea79 (patch) | |
| tree | 372d03319a6b4f05f99e02871ee66de0d4455da1 /cross | |
| parent | ae71b10efc0542a4004d37cdfa12c1e63dfb9772 (diff) | |
| download | pkgsrc-fbd54c964ddceb8414bf1a7870660d387acbea79.tar.gz | |
There is already a 'static' keyword present for part of this patch, so
patching in a second one is unnecessary, and for some compilers (GCC 4.4)
fatal at build time.
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/avr-gcc/distinfo | 4 | ||||
| -rw-r--r-- | cross/avr-gcc/patches/patch-gcc_cp_cfns.h | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/cross/avr-gcc/distinfo b/cross/avr-gcc/distinfo index 64c4c7560c5..9fd1f49feee 100644 --- a/cross/avr-gcc/distinfo +++ b/cross/avr-gcc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2012/11/16 00:38:21 joerg Exp $ +$NetBSD: distinfo,v 1.7 2012/12/12 23:44:40 dsainty Exp $ SHA1 (gcc-core-4.4.1.tar.bz2) = 7e18b5f49b77a78e0ccd31c82c6220c5756da754 RMD160 (gcc-core-4.4.1.tar.bz2) = 6545aea8ad1c9ae55cb0f12991456a0dd3bc490d @@ -9,5 +9,5 @@ Size (gcc-g++-4.4.1.tar.bz2) = 5936040 bytes SHA1 (patch-aa) = 17ee1942842186c4336d72bb8223bdb3023c85c1 SHA1 (patch-ab) = 4a3ab9719a6714933954a120ad8c594c3a4a2e1f SHA1 (patch-ac) = 14dbe72be88bd6fb0fd8671494454a6d4c11c4b7 -SHA1 (patch-gcc_cp_cfns.h) = cf57820c0ae992b30cb4f2be85521ea1fcf735d5 +SHA1 (patch-gcc_cp_cfns.h) = 747e918b167d120965de09f9ef3b563e8f8afdf6 SHA1 (patch-gcc_toplev.h) = 4378a41650336b91b376fcf158570290e1ef3714 diff --git a/cross/avr-gcc/patches/patch-gcc_cp_cfns.h b/cross/avr-gcc/patches/patch-gcc_cp_cfns.h index d960d3ecd50..2a5f3d2d6d6 100644 --- a/cross/avr-gcc/patches/patch-gcc_cp_cfns.h +++ b/cross/avr-gcc/patches/patch-gcc_cp_cfns.h @@ -1,8 +1,8 @@ -$NetBSD: patch-gcc_cp_cfns.h,v 1.1 2012/11/16 00:38:21 joerg Exp $ +$NetBSD: patch-gcc_cp_cfns.h,v 1.2 2012/12/12 23:44:40 dsainty Exp $ --- gcc/cp/cfns.h.orig 2012-11-14 17:13:55.000000000 +0000 +++ gcc/cp/cfns.h -@@ -35,13 +35,13 @@ __inline +@@ -35,7 +35,7 @@ #endif static unsigned int hash (const char *, unsigned int); #ifdef __GNUC__ @@ -11,10 +11,3 @@ $NetBSD: patch-gcc_cp_cfns.h,v 1.1 2012/11/16 00:38:21 joerg Exp $ #endif const char * libc_name_p (const char *, unsigned int); /* maximum key range = 391, duplicates = 0 */ - - #ifdef __GNUC__ --__inline -+static __inline - #else - #ifdef __cplusplus - inline |