diff options
author | markd <markd> | 2009-03-30 10:57:02 +0000 |
---|---|---|
committer | markd <markd> | 2009-03-30 10:57:02 +0000 |
commit | 9bc7ea459315ee776cf22ecb6112ec8cf249e343 (patch) | |
tree | 90680e9ddb3d425726a40122455c0560f08bca93 | |
parent | 9e3d908e2789228317caeea80cc62196c6b3a20a (diff) | |
download | pkgsrc-9bc7ea459315ee776cf22ecb6112ec8cf249e343.tar.gz |
Fix build on NetBSD 5.x using same patch Joerg applied to gcc3.
-rw-r--r-- | lang/gcc34/distinfo | 3 | ||||
-rw-r--r-- | lang/gcc34/patches/patch-at | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo index 032f54a70dc..6080d7cc5e4 100644 --- a/lang/gcc34/distinfo +++ b/lang/gcc34/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2006/04/05 11:03:59 shannonjr Exp $ +$NetBSD: distinfo,v 1.18 2009/03/30 10:57:02 markd Exp $ SHA1 (gcc-3.4.6.tar.bz2) = 97b290fdc572c8e490b3b39f243e69bacad23c2b RMD160 (gcc-3.4.6.tar.bz2) = b15003368cedc7964f6ceaee0c39ddc43a46c442 @@ -12,6 +12,7 @@ SHA1 (patch-aj) = ea0bef88be9e823ed2acfa54a59f29016de8cc5e SHA1 (patch-ak) = 1188e98e65fce3b968f9a2c211ffe315644d87d5 SHA1 (patch-al) = 3368a43981499dd46b2caa111eae19a0549d7499 SHA1 (patch-am) = 5a27d8f6a289f9b110a4bdc640547e43b799f08c +SHA1 (patch-at) = a8a310b85e661bbf2cb832027b84b72c1db27a0c SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6 SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0 SHA1 (patch-ca) = e04ff912406505abd015789f288ef09a7e1ae386 diff --git a/lang/gcc34/patches/patch-at b/lang/gcc34/patches/patch-at new file mode 100644 index 00000000000..f4d72aec34c --- /dev/null +++ b/lang/gcc34/patches/patch-at @@ -0,0 +1,24 @@ +$NetBSD: patch-at,v 1.1 2009/03/30 10:57:02 markd Exp $ + +Alternative fix for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38182 + +--- gcc/ginclude/stddef.h.orig 2009-02-28 18:57:06.000000000 +0100 ++++ gcc/ginclude/stddef.h +@@ -64,7 +64,7 @@ Boston, MA 02111-1307, USA. */ + /* In 4.3bsd-net2, machine/ansi.h defines these symbols, which are + defined if the corresponding type is *not* defined. + FreeBSD-2.1 defines _MACHINE_ANSI_H_ instead of _ANSI_H_ */ +-#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) ++#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) || defined(__NetBSD__) + #if !defined(_SIZE_T_) && !defined(_BSD_SIZE_T_) + #define _SIZE_T + #endif +@@ -359,7 +359,7 @@ typedef __WINT_TYPE__ wint_t; + /* In 4.3bsd-net2, leave these undefined to indicate that size_t, etc. + are already defined. */ + /* BSD/OS 3.1 and FreeBSD [23].x require the MACHINE_ANSI_H check here. */ +-#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) ++#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) || defined(__NetBSD__) + /* The references to _GCC_PTRDIFF_T_, _GCC_SIZE_T_, and _GCC_WCHAR_T_ + are probably typos and should be removed before 2.8 is released. */ + #ifdef _GCC_PTRDIFF_T_ |