summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2013-04-29 21:34:11 +0000
committerjoerg <joerg@pkgsrc.org>2013-04-29 21:34:11 +0000
commit2b7edba6b3d5ed51ac0112e248e4bdc8669f2787 (patch)
tree346efd62309579ff12122612eb2a9324a335cfc6
parent6e046ee9d87a4b818e73943146107b522dc94508 (diff)
downloadpkgsrc-2b7edba6b3d5ed51ac0112e248e4bdc8669f2787.tar.gz
Do not define putc/getc macros on NetBSD, it can wreak havoc with
cstdio.
-rw-r--r--lang/gcc48/distinfo3
-rw-r--r--lang/gcc48/patches/patch-gcc_system.h27
2 files changed, 29 insertions, 1 deletions
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index b73965e0679..1b0f2a717f8 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2013/04/21 16:10:28 adam Exp $
+$NetBSD: distinfo,v 1.4 2013/04/29 21:34:11 joerg Exp $
SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -16,6 +16,7 @@ SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d5
SHA1 (patch-gcc_configure) = a4b670d0c54c410d38715b7a2a572a7048e3ec5e
SHA1 (patch-gcc_fortran_f95-lang.c) = 06470dbee79f8c762675d3060a870b7dd9ba38f8
SHA1 (patch-gcc_ginclude_stddef.h) = 50be7c9469ac58c79e10abda5e7cfef5f91dd249
+SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
SHA1 (patch-include_libiberty.h) = ad2c64e9a14405c89b02ff68811b1c889405d0a1
SHA1 (patch-libgcc_config.host) = 1807e784c9808243d1a99b19534d94752d81ce6d
SHA1 (patch-libgcc_config_i386_dragonfly-unwind.h) = 9d77252dd982495e90f95b82706bab29e581df9f
diff --git a/lang/gcc48/patches/patch-gcc_system.h b/lang/gcc48/patches/patch-gcc_system.h
new file mode 100644
index 00000000000..a4802a7d838
--- /dev/null
+++ b/lang/gcc48/patches/patch-gcc_system.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-gcc_system.h,v 1.1 2013/04/29 21:34:11 joerg Exp $
+
+--- gcc/system.h.orig 2013-04-29 18:37:29.000000000 +0000
++++ gcc/system.h
+@@ -72,18 +72,22 @@ along with GCC; see the file COPYING3.
+
+ #if defined HAVE_DECL_PUTC_UNLOCKED && HAVE_DECL_PUTC_UNLOCKED
+
++# if !defined(__NetBSD__)
+ # ifdef HAVE_PUTC_UNLOCKED
+ # undef putc
+ # define putc(C, Stream) putc_unlocked (C, Stream)
+ # endif
++# endif
+ # ifdef HAVE_PUTCHAR_UNLOCKED
+ # undef putchar
+ # define putchar(C) putchar_unlocked (C)
+ # endif
++# if !defined(__NetBSD__)
+ # ifdef HAVE_GETC_UNLOCKED
+ # undef getc
+ # define getc(Stream) getc_unlocked (Stream)
+ # endif
++# endif
+ # ifdef HAVE_GETCHAR_UNLOCKED
+ # undef getchar
+ # define getchar() getchar_unlocked ()