diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2012-11-07 09:55:57 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2012-11-07 09:55:57 +0000 |
| commit | 0d883dc86fbfead6bd1b607e7be67058d112467e (patch) | |
| tree | 0bde2a5f647df30fd6e883a01a8d00072ae37d74 /debian/patches/libjava-multiarch.diff | |
| parent | fd8dcfc230a6f76588e01aa829156ca8b53aea0f (diff) | |
| download | gcc-47-0d883dc86fbfead6bd1b607e7be67058d112467e.tar.gz | |
- refresh patches
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6215 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/patches/libjava-multiarch.diff')
| -rw-r--r-- | debian/patches/libjava-multiarch.diff | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/debian/patches/libjava-multiarch.diff b/debian/patches/libjava-multiarch.diff index e777bf7..14cde95 100644 --- a/debian/patches/libjava-multiarch.diff +++ b/debian/patches/libjava-multiarch.diff @@ -1,9 +1,11 @@ # DP: Install libjava libraries to multiarch location +Index: b/src/libjava/configure.ac +=================================================================== --- a/src/libjava/configure.ac +++ b/src/libjava/configure.ac -@@ -1592,6 +1592,10 @@ - ../lib*) toolexeclibdir='$(subst /lib/../lib,/lib,'$toolexecmainlibdir/$multi_os_directory')' ;; +@@ -1603,6 +1603,10 @@ + .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /. *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;; esac + multiarch=`$CC -print-multiarch` @@ -13,7 +15,7 @@ ;; esac AC_SUBST(toolexecdir) -@@ -1618,6 +1622,10 @@ +@@ -1628,6 +1632,10 @@ dbexecdir='$(libdir)/'$multi_os_directory/$gcjsubdir ;; esac @@ -24,9 +26,11 @@ AC_SUBST(dbexecdir) AC_SUBST(gcjsubdir) +Index: b/src/libjava/Makefile.am +=================================================================== --- a/src/libjava/Makefile.am +++ b/src/libjava/Makefile.am -@@ -372,7 +372,7 @@ +@@ -371,7 +371,7 @@ -DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \ -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \ -DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \ @@ -35,6 +39,8 @@ -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 @@ @@ -46,6 +52,8 @@ -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 @@ @@ -59,6 +67,8 @@ 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 @@ |