summaryrefslogtreecommitdiffstats
path: root/gcc47-cross-jardir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gcc47-cross-jardir.patch')
-rw-r--r--gcc47-cross-jardir.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/gcc47-cross-jardir.patch b/gcc47-cross-jardir.patch
new file mode 100644
index 0000000..899a273
--- /dev/null
+++ b/gcc47-cross-jardir.patch
@@ -0,0 +1,22 @@
+--- origsrc/gcc-4.7.0/libjava/Makefile.am 2011-08-05 09:37:48.000000000 -0500
++++ src/gcc-4.7.0/libjava/Makefile.am 2012-06-12 02:57:16.508693300 -0500
+@@ -223,7 +223,7 @@ dbexec_LTLIBRARIES = libjvm.la
+
+ pkgconfigdir = $(libdir)/pkgconfig
+
+-jardir = $(datadir)/java
++jardir = $(datadir)/gcc-$(gcc_version)/$(target_noncanonical)/java
+ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
+ if INSTALL_ECJ_JAR
+ jar_DATA += $(ECJ_BUILD_JAR)
+--- origsrc/gcc-4.7.0/libjava/Makefile.in 2012-06-12 03:04:48.185527700 -0500
++++ src/gcc-4.7.0/libjava/Makefile.in 2012-03-22 02:37:39.000000000 -0500
+@@ -938,7 +938,7 @@ CORE_PACKAGE_SOURCE_FILES_LO = $(filter-
+ @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
+ dbexec_LTLIBRARIES = libjvm.la
+ pkgconfigdir = $(libdir)/pkgconfig
+-jardir = $(datadir)/java
++jardir = $(datadir)/gcc-$(gcc_version)/$(target_noncanonical)/java
+ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
+ $(am__append_5)
+ @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)