summaryrefslogtreecommitdiff
path: root/debian/patches/libjava-multiarch.diff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2013-03-08 06:55:50 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2013-03-08 06:55:50 +0000
commitf8decacc83bf610a1aa9417c15feb7e9ce93157b (patch)
treeadebee42950c61c1668844be02f666f688d80961 /debian/patches/libjava-multiarch.diff
parentbf2849540749896460b08cebcdce7e706de7a04c (diff)
downloadgcc-48-f8decacc83bf610a1aa9417c15feb7e9ce93157b.tar.gz
gcc-4.8 (4.8-20130308-1) experimental; urgency=low
* GCC snapshot 20130308, taken from the trunk. -- Matthias Klose <doko@debian.org> Fri, 08 Mar 2013 12:08:12 +0800 git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@6640 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/patches/libjava-multiarch.diff')
-rw-r--r--debian/patches/libjava-multiarch.diff8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/libjava-multiarch.diff b/debian/patches/libjava-multiarch.diff
index cee02b2..54db5df 100644
--- a/debian/patches/libjava-multiarch.diff
+++ b/debian/patches/libjava-multiarch.diff
@@ -4,7 +4,7 @@ Index: b/src/libjava/configure.ac
===================================================================
--- a/src/libjava/configure.ac
+++ b/src/libjava/configure.ac
-@@ -1583,6 +1583,10 @@
+@@ -1585,6 +1585,10 @@
.) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
*) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
esac
@@ -15,7 +15,7 @@ Index: b/src/libjava/configure.ac
;;
esac
AC_SUBST(toolexecdir)
-@@ -1608,6 +1612,10 @@
+@@ -1610,6 +1614,10 @@
dbexecdir='$(libdir)/'$multi_os_directory/$gcjsubdir
;;
esac
@@ -43,7 +43,7 @@ Index: b/src/libjava/Makefile.in
===================================================================
--- a/src/libjava/Makefile.in
+++ b/src/libjava/Makefile.in
-@@ -1020,7 +1020,7 @@
+@@ -1023,7 +1023,7 @@
-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
-DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \
@@ -56,7 +56,7 @@ 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 @@
+@@ -254,6 +254,10 @@
.) toolexeclibdir=${libdir} ;; # Avoid trailing /.
*) toolexeclibdir=${libdir}/${multi_os_directory} ;;
esac