diff options
| author | dsainty <dsainty@pkgsrc.org> | 2015-06-19 00:44:46 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2015-06-19 00:44:46 +0000 |
| commit | 5c3c78a489b9435aed43dd25e9013cf798c79421 (patch) | |
| tree | c9db4a09b2867081e85caf7174ca6d3f85d7f380 | |
| parent | c755a8ecdcbe015dbca45cfba9aba17f8ff15b0a (diff) | |
| download | pkgsrc-5c3c78a489b9435aed43dd25e9013cf798c79421.tar.gz | |
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.
| -rw-r--r-- | lang/gcc48/distinfo | 3 | ||||
| -rw-r--r-- | lang/gcc48/patches/patch-libiberty_Makefile.in | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo index 8bace0b9987..4795744bda1 100644 --- a/lang/gcc48/distinfo +++ b/lang/gcc48/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2015/06/03 06:48:54 dsainty Exp $ +$NetBSD: distinfo,v 1.24 2015/06/19 00:44:46 dsainty Exp $ SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a @@ -66,6 +66,7 @@ SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3 SHA1 (patch-libgo_config_libtool.m4) = d62f00eae3bbd89a878eaf4e0b995ac482a39992 SHA1 (patch-libgo_config_ltmain.sh) = 703a27554e479cc2e48410a6bb0e5f5b4be2c150 SHA1 (patch-libgomp_configure) = 8527167e1f08ac7e64277ac0d22532dd59394b64 +SHA1 (patch-libiberty_Makefile.in) = 36b972bbae1e09763c6dbc42e314c38838647eb2 SHA1 (patch-libiberty_cp-demangle.c) = 4f9a29efadd5dedd1de796c58389f9ed8b62ab74 SHA1 (patch-libjava_boehm.cc) = b18bc9d410a62543583c77e011f50b86f41ca18a SHA1 (patch-libjava_configure) = cf31039797226620dd9cc2a65209b354e2a74f0c diff --git a/lang/gcc48/patches/patch-libiberty_Makefile.in b/lang/gcc48/patches/patch-libiberty_Makefile.in new file mode 100644 index 00000000000..a00a20c03d5 --- /dev/null +++ b/lang/gcc48/patches/patch-libiberty_Makefile.in @@ -0,0 +1,18 @@ +$NetBSD: patch-libiberty_Makefile.in,v 1.1 2015/06/19 00:44:46 dsainty 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 2013-01-02 15:04:42.000000000 +1300 ++++ libiberty/Makefile.in 2015-06-18 17:22:12.145815941 +1200 +@@ -112,7 +112,7 @@ + + 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): |