From 8865a0da8241a58ea17377a682aed6402d35146e Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Mon, 1 Aug 2005 19:02:03 +0000
Subject: Update to the 20050730 snapshot of GCC 4.1.0.

Replace the WITHOUT_LIBJAVA knob by WITHOUT_JAVA which also disables
building the compiler and tools proper and avoids fetching the entire
Java frontend and library tarball.

Remove bogus ${PREFIX}/share/classpath/api directory that libjava adds
these days.

Make the (optional) handling of the Fortran and Java frontends easier
to understand.
---
 lang/gcc46/files/java-patch-hier | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 lang/gcc46/files/java-patch-hier

(limited to 'lang/gcc46/files/java-patch-hier')

diff --git a/lang/gcc46/files/java-patch-hier b/lang/gcc46/files/java-patch-hier
new file mode 100644
index 000000000000..af4e9b0ca2ce
--- /dev/null
+++ b/lang/gcc46/files/java-patch-hier
@@ -0,0 +1,16 @@
+Index: libjava/Makefile.in
+===================================================================
+RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
+retrieving revision 1.522
+diff -u -3 -p -r1.522 Makefile.in
+--- libjava/Makefile.in	19 May 2005 21:46:39 -0000	1.522
++++ libjava/Makefile.in	29 May 2005 16:00:44 -0000
+@@ -696,7 +696,7 @@ toolexeclib_LTLIBRARIES = libgcj.la libg
+     $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
+ 
+ toolexecmainlib_DATA = libgcj.spec
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ jardir = $(datadir)/java
+ jar_DATA = libgcj-$(gcc_version).jar
-- 
cgit v1.2.3