diff options
| author | martin <martin@pkgsrc.org> | 2003-07-29 09:05:54 +0000 |
|---|---|---|
| committer | martin <martin@pkgsrc.org> | 2003-07-29 09:05:54 +0000 |
| commit | 28f94e72423c85e8094721ca2bec67283a04227b (patch) | |
| tree | 3b03ba448a011e3a86cf90c2b00bb847ab3d4ccc /lang/gcc3-c | |
| parent | 5d8126aadb74a95eeff690a33037267a9c492fe9 (diff) | |
| download | pkgsrc-28f94e72423c85e8094721ca2bec67283a04227b.tar.gz | |
Sync with ../gcc3 (cpp defaults to -gcc).
Diffstat (limited to 'lang/gcc3-c')
| -rw-r--r-- | lang/gcc3-c/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc3-c/files/gcc3.mk | 4 | ||||
| -rw-r--r-- | lang/gcc3-c/patches/patch-af | 18 | ||||
| -rw-r--r-- | lang/gcc3-c/patches/patch-ag | 13 |
4 files changed, 36 insertions, 3 deletions
diff --git a/lang/gcc3-c/distinfo b/lang/gcc3-c/distinfo index 13ade26f7e5..db5c5f3a3be 100644 --- a/lang/gcc3-c/distinfo +++ b/lang/gcc3-c/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.3 2003/07/09 15:14:42 drochner Exp $ +$NetBSD: distinfo,v 1.4 2003/07/29 09:05:54 martin Exp $ SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a Size (gcc-3.3.tar.bz2) = 23447616 bytes SHA1 (patch-ab) = f0795e3792cd5200140bc19e291a2616b7d31468 SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741 +SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515 +SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c SHA1 (patch-ai) = bb9f4975769cd104b25b4609a1d4c888bb147bb1 SHA1 (patch-ba) = 9037d2504c5db6458494a18852d57c1ef5c9dcdb diff --git a/lang/gcc3-c/files/gcc3.mk b/lang/gcc3-c/files/gcc3.mk index e6100122af1..1089b16918c 100644 --- a/lang/gcc3-c/files/gcc3.mk +++ b/lang/gcc3-c/files/gcc3.mk @@ -1,7 +1,7 @@ -# $NetBSD: gcc3.mk,v 1.3 2003/07/17 09:07:56 abs Exp $ +# $NetBSD: gcc3.mk,v 1.4 2003/07/29 09:05:55 martin Exp $ # # make configuration file for @PKGNAME@ USE_GCC3= # defined CC= @GCC_PREFIX@/bin/cc -CPP= @GCC_PREFIX@/bin/cpp -gcc +CPP= @GCC_PREFIX@/bin/cpp diff --git a/lang/gcc3-c/patches/patch-af b/lang/gcc3-c/patches/patch-af new file mode 100644 index 00000000000..2c0dc8fa1c8 --- /dev/null +++ b/lang/gcc3-c/patches/patch-af @@ -0,0 +1,18 @@ +$NetBSD: patch-af,v 1.1 2003/07/29 09:05:56 martin Exp $ + +--- gcc/cppspec.c Wed Jul 23 02:40:54 2003 ++++ gcc/cppspec.c Fri Jul 25 17:57:41 2003 +@@ -85,6 +85,13 @@ + + is_cpp_driver = 1; + ++ /* NetBSD uses __GNUC__ and friends in header files processed with cpp ++ regularly. Default to old behaviour here. XXX - move me to ++ config/netbsd.h "DEFAULT_CPP_NEED_NO_GCC". */ ++#ifdef DEFAULT_CPP_NEED_NO_GCC ++ need_no_gcc = DEFAULT_CPP_NEED_NO_GCC; ++#endif ++ + /* First pass. If we see an -S or -c, barf. If we see an input file, + turn off read_stdin. If we see a second input file, it is actually + the output file. If we see a third input file, barf. */ diff --git a/lang/gcc3-c/patches/patch-ag b/lang/gcc3-c/patches/patch-ag new file mode 100644 index 00000000000..79946e0ebeb --- /dev/null +++ b/lang/gcc3-c/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2003/07/29 09:05:56 martin Exp $ + +Index: gcc/config/netbsd.h +--- gcc/config/netbsd.h Wed Jul 23 02:41:37 2003 ++++ gcc/config/netbsd.h Fri Jul 25 17:57:43 2003 +@@ -234,3 +234,7 @@ + /* 7 == PROT_READ | PROT_WRITE | PROT_EXEC */ \ + (void) mprotect (page, end - page, 7); \ + } ++ ++/* NetBSD depends on "cpp" having GNUC semantics, and must default as if ++ "cpp -gcc" was called. */ ++#define DEFAULT_CPP_NEED_NO_GCC 0 |