diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-06-19 09:05:11 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-06-19 09:05:11 +0000 |
| commit | aac947b81ee46f2c37226b6b041e3309aabf1d23 (patch) | |
| tree | 1c6cf6cc427f311d76e3609539e450e5ebd00f8a /lang | |
| parent | 2e25ca93ea3dc4026e3421d0cde0eaadf94ecefb (diff) | |
| download | pkgsrc-aac947b81ee46f2c37226b6b041e3309aabf1d23.tar.gz | |
Backport dsainty's gcc48 fix to gcc47.
The ${PREFIX}/include/ansidecl.h installed by devel/binutils is not
necessarily compatible (E.g. binutils-2.25 does not define PARAMS). Adjust
the include path priority so the internal ansidecl.h gets precedence, allowing
cp-demangle.c to use libiberty.h without compilation errors.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc47/distinfo | 3 | ||||
| -rw-r--r-- | lang/gcc47/patches/patch-libiberty_Makefile.in | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo index 0cd9fdf8dfb..d35237d5717 100644 --- a/lang/gcc47/distinfo +++ b/lang/gcc47/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2015/03/12 14:53:13 ryoon Exp $ +$NetBSD: distinfo,v 1.24 2015/06/19 09:05:11 jperkin Exp $ SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a @@ -31,6 +31,7 @@ SHA1 (patch-libgfortran_configure) = b3bbc7d9201073a1bed0b7e10141465bab52c8be SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3 SHA1 (patch-libgo_config_ltmain.sh) = 703a27554e479cc2e48410a6bb0e5f5b4be2c150 SHA1 (patch-libgo_runtime_proc.c) = 55b2c449f4d43fe9b6d7ca1c7f075feebca8ebd6 +SHA1 (patch-libiberty_Makefile.in) = 2a652933a27f670aa5d6fa6e422148bfd01ea82d SHA1 (patch-libjava_Makefile.in) = cbf10e212e3865f73f21557eda70d0ad1e860d66 SHA1 (patch-libjava_boehm.cc) = b18bc9d410a62543583c77e011f50b86f41ca18a SHA1 (patch-libjava_configure) = 48ea2baffe87e09dda8133d286bd9b1bfe4c3f8a diff --git a/lang/gcc47/patches/patch-libiberty_Makefile.in b/lang/gcc47/patches/patch-libiberty_Makefile.in new file mode 100644 index 00000000000..881c796a250 --- /dev/null +++ b/lang/gcc47/patches/patch-libiberty_Makefile.in @@ -0,0 +1,18 @@ +$NetBSD: patch-libiberty_Makefile.in,v 1.1 2015/06/19 09:05:11 jperkin Exp $ + +The ${PREFIX}/include/ansidecl.h installed by devel/binutils is not +necessarily compatible (E.g. binutils-2.25 does not define PARAMS). Adjust +the include path priority so the internal ansidecl.h gets precedence, allowing +cp-demangle.c to use libiberty.h without compilation errors. + +--- libiberty/Makefile.in.orig 2012-08-06 14:34:27.000000000 +0000 ++++ libiberty/Makefile.in +@@ -112,7 +112,7 @@ installcheck: installcheck-subdir + + INCDIR=$(srcdir)/$(MULTISRCTOP)../include + +-COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEFINES) @ac_libiberty_warn_cflags@ ++COMPILE.c = $(CC) -c @DEFS@ -I. -I$(INCDIR) $(CFLAGS) $(CPPFLAGS) $(HDEFINES) @ac_libiberty_warn_cflags@ + + # Just to make sure we don't use a built-in rule with VPATH + .c.$(objext): |