/usr/src/gcc-4.7/debian/patches/libjava-multiarch.diff is in gcc-4.7-source 4.7.4-3ubuntu12.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | # DP: Install libjava libraries to multiarch location
Index: b/src/libjava/configure.ac
===================================================================
--- a/src/libjava/configure.ac
+++ b/src/libjava/configure.ac
@@ -1603,6 +1603,10 @@
.) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
*) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
esac
+ multiarch=`$CC -print-multiarch`
+ if test -n "$multiarch"; then
+ toolexeclibdir=$toolexecmainlibdir/$multiarch
+ fi
;;
esac
AC_SUBST(toolexecdir)
@@ -1628,6 +1632,10 @@
dbexecdir='$(libdir)/'$multi_os_directory/$gcjsubdir
;;
esac
+multiarch=`$CC -print-multiarch`
+if test -n "$multiarch"; then
+ dbexecdir='$(libdir)/'$multiarch/$gcjsubdir
+fi
AC_SUBST(dbexecdir)
AC_SUBST(gcjsubdir)
Index: b/src/libjava/Makefile.am
===================================================================
--- a/src/libjava/Makefile.am
+++ b/src/libjava/Makefile.am
@@ -371,7 +371,7 @@
-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
-DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \
- -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
+ -DLIBGCJ_DEFAULT_DATABASE="\"/var/lib/$(MULTIARCH_DIR)/gcj-4.7/$(db_name)\"" \
-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\""
AM_GCJFLAGS = \
Index: b/src/libjava/Makefile.in
===================================================================
--- a/src/libjava/Makefile.in
+++ b/src/libjava/Makefile.in
@@ -1019,7 +1019,7 @@
-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
-DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \
- -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
+ -DLIBGCJ_DEFAULT_DATABASE="\"/var/lib/$(MULTIARCH_DIR)/gcj-4.7/$(db_name)\"" \
-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\""
AM_GCJFLAGS = \
Index: b/src/libjava/classpath/m4/acinclude.m4
===================================================================
--- a/src/libjava/classpath/m4/acinclude.m4
+++ b/src/libjava/classpath/m4/acinclude.m4
@@ -252,6 +252,10 @@
.) toolexeclibdir=${libdir} ;; # Avoid trailing /.
*) toolexeclibdir=${libdir}/${multi_os_directory} ;;
esac
+ multiarch=`$CC -print-multiarch`
+ if test -n "$multiarch"; then
+ toolexeclibdir=${libdir}/${multiarch}
+ fi
AC_SUBST(toolexeclibdir)
])
Index: b/src/libjava/classpath/configure.ac
===================================================================
--- a/src/libjava/classpath/configure.ac
+++ b/src/libjava/classpath/configure.ac
@@ -16,6 +16,8 @@
AC_CANONICAL_TARGET
+dnl dummy change to run autoconf
+
dnl GCJ LOCAL
AC_ARG_ENABLE(java-maintainer-mode,
AS_HELP_STRING([--enable-java-maintainer-mode],
|