diff options
Diffstat (limited to 'recipes/gcc/gcc-svn/debian/libjava-subdir.dpatch')
| -rw-r--r-- | recipes/gcc/gcc-svn/debian/libjava-subdir.dpatch | 246 |
1 files changed, 0 insertions, 246 deletions
diff --git a/recipes/gcc/gcc-svn/debian/libjava-subdir.dpatch b/recipes/gcc/gcc-svn/debian/libjava-subdir.dpatch deleted file mode 100644 index ec707b8b5e..0000000000 --- a/recipes/gcc/gcc-svn/debian/libjava-subdir.dpatch +++ /dev/null @@ -1,246 +0,0 @@ -#! /bin/sh -e - -# DP: - Set the libjava sublibdir to /usr/lib/gcj-4.3 -# DP: - Set the default libgcj database dir to /var/lib/gcj-4.3 - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - cd ${dir}libjava && aclocal -I . -I .. -I ../config -I libltdl && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - rm -f ${dir}libjava/configure - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- gcc/java/Make-lang.in.orig 2007-09-06 21:19:09.582719152 +0200 -+++ gcc/java/Make-lang.in 2007-09-06 21:20:32.543970604 +0200 -@@ -313,12 +313,13 @@ - $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(ZLIBINC) \ - $(srcdir)/java/jcf-io.c $(OUTPUT_OPTION) - -+short_version := $(shell echo $(version) | sed -r 's/([0-9]+\.[0-9]+).*/\1/') - # jcf-path.o needs a -D. - java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ - java/jcf.h - $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -- -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \ -- -DDEFAULT_TARGET_VERSION=\"$(version)\" \ -+ -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(short_version).jar"' \ -+ -DDEFAULT_TARGET_VERSION=\"$(short_version)\" \ - $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION) - - TEXI_JAVA_FILES = java/gcj.texi $(gcc_docdir)/include/fdl.texi \ ---- libjava/classpath/configure.ac.orig 2008-01-13 17:18:19.000000000 +0100 -+++ libjava/classpath/configure.ac 2008-01-13 17:18:45.000000000 +0100 -@@ -301,7 +301,7 @@ - nativeexeclibdir=${withval} - ], - [ -- nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[[^#]].*:/ { print $1 }' ${srcdir}/../libtool-version` -+ nativeexeclibdir='${toolexeclibdir}/gcj-'`sed -r 's/([[0-9]]+\.[[0-9]]+).*/\1/' ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[[^#]].*:/ { print $1 }' ${srcdir}/../libtool-version` - ]) - - AC_SUBST(nativeexeclibdir) ---- libjava/classpath/configure.orig 2008-01-13 17:18:20.000000000 +0100 -+++ libjava/classpath/configure 2008-01-13 17:18:45.000000000 +0100 -@@ -4771,7 +4771,7 @@ - - else - -- nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[^#].*:/ { print $1 }' ${srcdir}/../libtool-version` -+ nativeexeclibdir='${toolexeclibdir}/gcj-'`sed -r 's/([0-9]+\.[0-9]+).*/\1/' ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[^#].*:/ { print $1 }' ${srcdir}/../libtool-version` - - fi; - ---- libjava/testsuite/lib/libjava.exp.orig 2008-01-13 17:18:20.000000000 +0100 -+++ libjava/testsuite/lib/libjava.exp 2008-01-13 17:18:45.000000000 +0100 -@@ -169,6 +169,7 @@ - set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] - regexp " version \[^\n\r\]*" $text version - set libjava_version [lindex $version 1] -+ set libjava_version "4.3" - - verbose "version: $libjava_version" - ---- libjava/testsuite/Makefile.am.orig 2008-01-13 17:18:20.000000000 +0100 -+++ libjava/testsuite/Makefile.am 2008-01-13 17:18:45.000000000 +0100 -@@ -4,6 +4,7 @@ - - # May be used by various substitution variables. - gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -+gcc_short_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER) - - # autoconf2.13's target_alias - target_noncanonical = @target_noncanonical@ -@@ -59,11 +60,11 @@ - rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \ - if test -n "$$testdep"; then \ - $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ -- $(top_builddir)/libgcj-$(gcc_version).jar::$$testtmpdir \ -+ $(top_builddir)/libgcj-$(gcc_short_version).jar::$$testtmpdir \ - -d $$testtmpdir $(srcdir)/$$testdep || exit; \ - fi; \ - $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ -- $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \ -+ $(top_builddir)/libgcj-$(gcc_short_version).jar:$$testtmpdir \ - -d $$testtmpdir $(srcdir)/$$test || exit; \ - case "$$test" in \ - libjava.loader/dummy.java) \ -@@ -75,7 +76,7 @@ - esac; \ - if test -n "$$genheader"; then \ - $(MYGCJH) $$genheader $$testtmpdir/*.class \ -- -bootclasspath $(top_builddir)/libgcj-$(gcc_version).jar \ -+ -bootclasspath $(top_builddir)/libgcj-$(gcc_short_version).jar \ - -d $$testtmpdir/ || exit; \ - mv $$testtmpdir/*.h $(srcdir)/`dirname $$test`/ 2>/dev/null; \ - fi; \ ---- libjava/testsuite/Makefile.in.orig 2008-01-13 17:18:20.000000000 +0100 -+++ libjava/testsuite/Makefile.in 2008-01-13 17:18:45.000000000 +0100 -@@ -327,6 +327,7 @@ - - # May be used by various substitution variables. - gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -+gcc_short_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER) - - # Setup the testing framework, if you have one - EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \ -@@ -576,11 +577,11 @@ - @JAVA_MAINTAINER_MODE_TRUE@ rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \ - @JAVA_MAINTAINER_MODE_TRUE@ if test -n "$$testdep"; then \ - @JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ --@JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_version).jar::$$testtmpdir \ -+@JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_short_version).jar::$$testtmpdir \ - @JAVA_MAINTAINER_MODE_TRUE@ -d $$testtmpdir $(srcdir)/$$testdep || exit; \ - @JAVA_MAINTAINER_MODE_TRUE@ fi; \ - @JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ --@JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \ -+@JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_short_version).jar:$$testtmpdir \ - @JAVA_MAINTAINER_MODE_TRUE@ -d $$testtmpdir $(srcdir)/$$test || exit; \ - @JAVA_MAINTAINER_MODE_TRUE@ case "$$test" in \ - @JAVA_MAINTAINER_MODE_TRUE@ libjava.loader/dummy.java) \ -@@ -592,7 +593,7 @@ - @JAVA_MAINTAINER_MODE_TRUE@ esac; \ - @JAVA_MAINTAINER_MODE_TRUE@ if test -n "$$genheader"; then \ - @JAVA_MAINTAINER_MODE_TRUE@ $(MYGCJH) $$genheader $$testtmpdir/*.class \ --@JAVA_MAINTAINER_MODE_TRUE@ -bootclasspath $(top_builddir)/libgcj-$(gcc_version).jar \ -+@JAVA_MAINTAINER_MODE_TRUE@ -bootclasspath $(top_builddir)/libgcj-$(gcc_short_version).jar \ - @JAVA_MAINTAINER_MODE_TRUE@ -d $$testtmpdir/ || exit; \ - @JAVA_MAINTAINER_MODE_TRUE@ mv $$testtmpdir/*.h $(srcdir)/`dirname $$test`/ 2>/dev/null; \ - @JAVA_MAINTAINER_MODE_TRUE@ fi; \ ---- libjava/Makefile.am.orig 2008-01-13 17:18:20.000000000 +0100 -+++ libjava/Makefile.am 2008-01-13 17:18:45.000000000 +0100 -@@ -5,7 +5,8 @@ - ACLOCAL_AMFLAGS = -I . -I .. -I ../config -I libltdl - - # May be used by various substitution variables. --gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -+gcc_full_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -+gcc_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER) - - SUBDIRS = $(DIRLTDL) gcj include classpath - if TESTSUBDIR -@@ -27,9 +28,9 @@ - target_noncanonical = @target_noncanonical@ - - # This is required by TL_AC_GXX_INCLUDE_DIR. --libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) -+libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_full_version) - --libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) -+libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_full_version) - - ## - ## What gets installed, and where. -@@ -141,7 +142,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/gcj-4.3/$(db_name)\"" \ - -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" - - AM_GCJFLAGS = \ ---- libjava/Makefile.in.orig 2008-01-13 17:18:20.000000000 +0100 -+++ libjava/Makefile.in 2008-01-13 17:18:45.000000000 +0100 -@@ -816,7 +816,8 @@ - ACLOCAL_AMFLAGS = -I . -I .. -I ../config -I libltdl - - # May be used by various substitution variables. --gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -+gcc_full_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -+gcc_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER) - SUBDIRS = $(DIRLTDL) gcj include classpath $(am__append_1) - - # write_entries_to_file - writes each entry in a list -@@ -829,8 +830,8 @@ - write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach object,$(1),$(shell echo $(object) >> $(2))) - - # This is required by TL_AC_GXX_INCLUDE_DIR. --libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) --libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) -+libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_full_version) -+libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_full_version) - toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \ - $(am__append_2) $(am__append_3) - toolexecmainlib_DATA = libgcj.spec -@@ -875,7 +876,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/gcj-4.3/$(db_name)\"" \ - -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" - - AM_GCJFLAGS = \ ---- libjava/configure.ac.orig 2008-01-13 17:18:20.000000000 +0100 -+++ libjava/configure.ac 2008-01-13 17:18:45.000000000 +0100 -@@ -511,6 +511,9 @@ - AS_HELP_STRING([--with-java-home=DIRECTORY], - [value of java.home system property]), - [JAVA_HOME="${withval}"], [JAVA_HOME=""]) -+if test -n "$with_multisubdir"; then -+ JAVA_HOME=`echo $JAVA_HOME | sed "s,/usr/lib/,/usr/lib$with_multisubdir/,"` -+fi - AM_CONDITIONAL(JAVA_HOME_SET, test ! -z "$JAVA_HOME") - AC_SUBST(JAVA_HOME) - -@@ -1385,6 +1388,7 @@ - multi_os_directory=`$CC -print-multi-os-directory` - case $multi_os_directory in - .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /. -+ ../lib*) toolexeclibdir='$(subst /lib/../lib,/lib,'$toolexecmainlibdir/$multi_os_directory')' ;; - *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;; - esac - ;; -@@ -1395,6 +1399,7 @@ - - # Determine gcj and libgcj version number. - gcjversion=`cat "$srcdir/../gcc/BASE-VER"` -+short_version=`sed -r 's/([[0-9]]+\.[[0-9]]+).*/\1/' $srcdir/../gcc/BASE-VER` - libgcj_soversion=`awk -F: '/^[[^#]].*:/ { print $1 }' $srcdir/libtool-version` - GCJVERSION=$gcjversion - AC_SUBST(GCJVERSION) -@@ -1402,7 +1407,7 @@ - - # Determine where the standard .db file and GNU Classpath JNI - # libraries are found. --gcjsubdir=gcj-$gcjversion-$libgcj_soversion -+gcjsubdir=gcj-$short_version-$libgcj_soversion - multi_os_directory=`$CC -print-multi-os-directory` - case $multi_os_directory in - .) |