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
@@ -1580,6 +1580,10 @@ case ${version_specific_libs} in
.) 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)
@@ -1597,6 +1601,10 @@ AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERS
# libraries are found.
gcjsubdir=gcj-$gcjversion-$libgcj_soversion
dbexecdir='$(toolexeclibdir)/'$gcjsubdir
+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
@@ -373,7 +373,7 @@ AM_CXXFLAGS = \
-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-5/$(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
@@ -1032,7 +1032,7 @@ AM_CXXFLAGS = \
-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-5/$(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
@@ -276,6 +276,10 @@ AC_DEFUN([CLASSPATH_TOOLEXECLIBDIR],
esac
;;
esac
+ multiarch=`$CC -print-multiarch`
+ if test -n "$multiarch"; then
+ toolexeclibdir=${libdir}/${multiarch}
+ fi
AC_SUBST(toolexecdir)
AC_SUBST(toolexecmainlibdir)
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 @@ dnl END GCJ LOCAL
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],
|
