diff options
author | Richard Purdie <richard@openedhand.com> | 2008-07-18 12:28:46 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-07-18 12:28:46 +0000 |
commit | e8bda8575637b967afaa0321fc3aeb69e809087a (patch) | |
tree | d4865b2556e227b403f9c13ad128d9bfb3c009d8 /meta/packages/gcc/gcc-4.3.1/debian/libjava-subdir.dpatch | |
parent | f204c8376f18d6cc443e7f4533d7eeace5d45f95 (diff) | |
download | poky-e8bda8575637b967afaa0321fc3aeb69e809087a.tar.gz |
gcc 4.3.0 -> 4.3.1 (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4876 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gcc/gcc-4.3.1/debian/libjava-subdir.dpatch')
-rw-r--r-- | meta/packages/gcc/gcc-4.3.1/debian/libjava-subdir.dpatch | 246 |
1 files changed, 246 insertions, 0 deletions
diff --git a/meta/packages/gcc/gcc-4.3.1/debian/libjava-subdir.dpatch b/meta/packages/gcc/gcc-4.3.1/debian/libjava-subdir.dpatch new file mode 100644 index 0000000000..ec707b8b5e --- /dev/null +++ b/meta/packages/gcc/gcc-4.3.1/debian/libjava-subdir.dpatch | |||
@@ -0,0 +1,246 @@ | |||
1 | #! /bin/sh -e | ||
2 | |||
3 | # DP: - Set the libjava sublibdir to /usr/lib/gcj-4.3 | ||
4 | # DP: - Set the default libgcj database dir to /var/lib/gcj-4.3 | ||
5 | |||
6 | dir= | ||
7 | if [ $# -eq 3 -a "$2" = '-d' ]; then | ||
8 | pdir="-d $3" | ||
9 | dir="$3/" | ||
10 | elif [ $# -ne 1 ]; then | ||
11 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
12 | exit 1 | ||
13 | fi | ||
14 | case "$1" in | ||
15 | -patch) | ||
16 | patch $pdir -f --no-backup-if-mismatch -p0 < $0 | ||
17 | cd ${dir}libjava && aclocal -I . -I .. -I ../config -I libltdl && autoconf | ||
18 | ;; | ||
19 | -unpatch) | ||
20 | patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 | ||
21 | rm -f ${dir}libjava/configure | ||
22 | ;; | ||
23 | *) | ||
24 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
25 | exit 1 | ||
26 | esac | ||
27 | exit 0 | ||
28 | |||
29 | --- gcc/java/Make-lang.in.orig 2007-09-06 21:19:09.582719152 +0200 | ||
30 | +++ gcc/java/Make-lang.in 2007-09-06 21:20:32.543970604 +0200 | ||
31 | @@ -313,12 +313,13 @@ | ||
32 | $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(ZLIBINC) \ | ||
33 | $(srcdir)/java/jcf-io.c $(OUTPUT_OPTION) | ||
34 | |||
35 | +short_version := $(shell echo $(version) | sed -r 's/([0-9]+\.[0-9]+).*/\1/') | ||
36 | # jcf-path.o needs a -D. | ||
37 | java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ | ||
38 | java/jcf.h | ||
39 | $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ | ||
40 | - -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \ | ||
41 | - -DDEFAULT_TARGET_VERSION=\"$(version)\" \ | ||
42 | + -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(short_version).jar"' \ | ||
43 | + -DDEFAULT_TARGET_VERSION=\"$(short_version)\" \ | ||
44 | $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION) | ||
45 | |||
46 | TEXI_JAVA_FILES = java/gcj.texi $(gcc_docdir)/include/fdl.texi \ | ||
47 | --- libjava/classpath/configure.ac.orig 2008-01-13 17:18:19.000000000 +0100 | ||
48 | +++ libjava/classpath/configure.ac 2008-01-13 17:18:45.000000000 +0100 | ||
49 | @@ -301,7 +301,7 @@ | ||
50 | nativeexeclibdir=${withval} | ||
51 | ], | ||
52 | [ | ||
53 | - nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[[^#]].*:/ { print $1 }' ${srcdir}/../libtool-version` | ||
54 | + nativeexeclibdir='${toolexeclibdir}/gcj-'`sed -r 's/([[0-9]]+\.[[0-9]]+).*/\1/' ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[[^#]].*:/ { print $1 }' ${srcdir}/../libtool-version` | ||
55 | ]) | ||
56 | |||
57 | AC_SUBST(nativeexeclibdir) | ||
58 | --- libjava/classpath/configure.orig 2008-01-13 17:18:20.000000000 +0100 | ||
59 | +++ libjava/classpath/configure 2008-01-13 17:18:45.000000000 +0100 | ||
60 | @@ -4771,7 +4771,7 @@ | ||
61 | |||
62 | else | ||
63 | |||
64 | - nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[^#].*:/ { print $1 }' ${srcdir}/../libtool-version` | ||
65 | + nativeexeclibdir='${toolexeclibdir}/gcj-'`sed -r 's/([0-9]+\.[0-9]+).*/\1/' ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[^#].*:/ { print $1 }' ${srcdir}/../libtool-version` | ||
66 | |||
67 | fi; | ||
68 | |||
69 | --- libjava/testsuite/lib/libjava.exp.orig 2008-01-13 17:18:20.000000000 +0100 | ||
70 | +++ libjava/testsuite/lib/libjava.exp 2008-01-13 17:18:45.000000000 +0100 | ||
71 | @@ -169,6 +169,7 @@ | ||
72 | set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] | ||
73 | regexp " version \[^\n\r\]*" $text version | ||
74 | set libjava_version [lindex $version 1] | ||
75 | + set libjava_version "4.3" | ||
76 | |||
77 | verbose "version: $libjava_version" | ||
78 | |||
79 | --- libjava/testsuite/Makefile.am.orig 2008-01-13 17:18:20.000000000 +0100 | ||
80 | +++ libjava/testsuite/Makefile.am 2008-01-13 17:18:45.000000000 +0100 | ||
81 | @@ -4,6 +4,7 @@ | ||
82 | |||
83 | # May be used by various substitution variables. | ||
84 | gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) | ||
85 | +gcc_short_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER) | ||
86 | |||
87 | # autoconf2.13's target_alias | ||
88 | target_noncanonical = @target_noncanonical@ | ||
89 | @@ -59,11 +60,11 @@ | ||
90 | rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \ | ||
91 | if test -n "$$testdep"; then \ | ||
92 | $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ | ||
93 | - $(top_builddir)/libgcj-$(gcc_version).jar::$$testtmpdir \ | ||
94 | + $(top_builddir)/libgcj-$(gcc_short_version).jar::$$testtmpdir \ | ||
95 | -d $$testtmpdir $(srcdir)/$$testdep || exit; \ | ||
96 | fi; \ | ||
97 | $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ | ||
98 | - $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \ | ||
99 | + $(top_builddir)/libgcj-$(gcc_short_version).jar:$$testtmpdir \ | ||
100 | -d $$testtmpdir $(srcdir)/$$test || exit; \ | ||
101 | case "$$test" in \ | ||
102 | libjava.loader/dummy.java) \ | ||
103 | @@ -75,7 +76,7 @@ | ||
104 | esac; \ | ||
105 | if test -n "$$genheader"; then \ | ||
106 | $(MYGCJH) $$genheader $$testtmpdir/*.class \ | ||
107 | - -bootclasspath $(top_builddir)/libgcj-$(gcc_version).jar \ | ||
108 | + -bootclasspath $(top_builddir)/libgcj-$(gcc_short_version).jar \ | ||
109 | -d $$testtmpdir/ || exit; \ | ||
110 | mv $$testtmpdir/*.h $(srcdir)/`dirname $$test`/ 2>/dev/null; \ | ||
111 | fi; \ | ||
112 | --- libjava/testsuite/Makefile.in.orig 2008-01-13 17:18:20.000000000 +0100 | ||
113 | +++ libjava/testsuite/Makefile.in 2008-01-13 17:18:45.000000000 +0100 | ||
114 | @@ -327,6 +327,7 @@ | ||
115 | |||
116 | # May be used by various substitution variables. | ||
117 | gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) | ||
118 | +gcc_short_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER) | ||
119 | |||
120 | # Setup the testing framework, if you have one | ||
121 | EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \ | ||
122 | @@ -576,11 +577,11 @@ | ||
123 | @JAVA_MAINTAINER_MODE_TRUE@ rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \ | ||
124 | @JAVA_MAINTAINER_MODE_TRUE@ if test -n "$$testdep"; then \ | ||
125 | @JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ | ||
126 | -@JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_version).jar::$$testtmpdir \ | ||
127 | +@JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_short_version).jar::$$testtmpdir \ | ||
128 | @JAVA_MAINTAINER_MODE_TRUE@ -d $$testtmpdir $(srcdir)/$$testdep || exit; \ | ||
129 | @JAVA_MAINTAINER_MODE_TRUE@ fi; \ | ||
130 | @JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ | ||
131 | -@JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \ | ||
132 | +@JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_short_version).jar:$$testtmpdir \ | ||
133 | @JAVA_MAINTAINER_MODE_TRUE@ -d $$testtmpdir $(srcdir)/$$test || exit; \ | ||
134 | @JAVA_MAINTAINER_MODE_TRUE@ case "$$test" in \ | ||
135 | @JAVA_MAINTAINER_MODE_TRUE@ libjava.loader/dummy.java) \ | ||
136 | @@ -592,7 +593,7 @@ | ||
137 | @JAVA_MAINTAINER_MODE_TRUE@ esac; \ | ||
138 | @JAVA_MAINTAINER_MODE_TRUE@ if test -n "$$genheader"; then \ | ||
139 | @JAVA_MAINTAINER_MODE_TRUE@ $(MYGCJH) $$genheader $$testtmpdir/*.class \ | ||
140 | -@JAVA_MAINTAINER_MODE_TRUE@ -bootclasspath $(top_builddir)/libgcj-$(gcc_version).jar \ | ||
141 | +@JAVA_MAINTAINER_MODE_TRUE@ -bootclasspath $(top_builddir)/libgcj-$(gcc_short_version).jar \ | ||
142 | @JAVA_MAINTAINER_MODE_TRUE@ -d $$testtmpdir/ || exit; \ | ||
143 | @JAVA_MAINTAINER_MODE_TRUE@ mv $$testtmpdir/*.h $(srcdir)/`dirname $$test`/ 2>/dev/null; \ | ||
144 | @JAVA_MAINTAINER_MODE_TRUE@ fi; \ | ||
145 | --- libjava/Makefile.am.orig 2008-01-13 17:18:20.000000000 +0100 | ||
146 | +++ libjava/Makefile.am 2008-01-13 17:18:45.000000000 +0100 | ||
147 | @@ -5,7 +5,8 @@ | ||
148 | ACLOCAL_AMFLAGS = -I . -I .. -I ../config -I libltdl | ||
149 | |||
150 | # May be used by various substitution variables. | ||
151 | -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) | ||
152 | +gcc_full_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) | ||
153 | +gcc_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER) | ||
154 | |||
155 | SUBDIRS = $(DIRLTDL) gcj include classpath | ||
156 | if TESTSUBDIR | ||
157 | @@ -27,9 +28,9 @@ | ||
158 | target_noncanonical = @target_noncanonical@ | ||
159 | |||
160 | # This is required by TL_AC_GXX_INCLUDE_DIR. | ||
161 | -libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) | ||
162 | +libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_full_version) | ||
163 | |||
164 | -libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) | ||
165 | +libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_full_version) | ||
166 | |||
167 | ## | ||
168 | ## What gets installed, and where. | ||
169 | @@ -141,7 +142,7 @@ | ||
170 | -DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \ | ||
171 | -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \ | ||
172 | -DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \ | ||
173 | - -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \ | ||
174 | + -DLIBGCJ_DEFAULT_DATABASE="\"/var/lib/gcj-4.3/$(db_name)\"" \ | ||
175 | -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" | ||
176 | |||
177 | AM_GCJFLAGS = \ | ||
178 | --- libjava/Makefile.in.orig 2008-01-13 17:18:20.000000000 +0100 | ||
179 | +++ libjava/Makefile.in 2008-01-13 17:18:45.000000000 +0100 | ||
180 | @@ -816,7 +816,8 @@ | ||
181 | ACLOCAL_AMFLAGS = -I . -I .. -I ../config -I libltdl | ||
182 | |||
183 | # May be used by various substitution variables. | ||
184 | -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) | ||
185 | +gcc_full_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) | ||
186 | +gcc_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER) | ||
187 | SUBDIRS = $(DIRLTDL) gcj include classpath $(am__append_1) | ||
188 | |||
189 | # write_entries_to_file - writes each entry in a list | ||
190 | @@ -829,8 +830,8 @@ | ||
191 | write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach object,$(1),$(shell echo $(object) >> $(2))) | ||
192 | |||
193 | # This is required by TL_AC_GXX_INCLUDE_DIR. | ||
194 | -libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) | ||
195 | -libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) | ||
196 | +libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_full_version) | ||
197 | +libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_full_version) | ||
198 | toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \ | ||
199 | $(am__append_2) $(am__append_3) | ||
200 | toolexecmainlib_DATA = libgcj.spec | ||
201 | @@ -875,7 +876,7 @@ | ||
202 | -DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \ | ||
203 | -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \ | ||
204 | -DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \ | ||
205 | - -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \ | ||
206 | + -DLIBGCJ_DEFAULT_DATABASE="\"/var/lib/gcj-4.3/$(db_name)\"" \ | ||
207 | -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" | ||
208 | |||
209 | AM_GCJFLAGS = \ | ||
210 | --- libjava/configure.ac.orig 2008-01-13 17:18:20.000000000 +0100 | ||
211 | +++ libjava/configure.ac 2008-01-13 17:18:45.000000000 +0100 | ||
212 | @@ -511,6 +511,9 @@ | ||
213 | AS_HELP_STRING([--with-java-home=DIRECTORY], | ||
214 | [value of java.home system property]), | ||
215 | [JAVA_HOME="${withval}"], [JAVA_HOME=""]) | ||
216 | +if test -n "$with_multisubdir"; then | ||
217 | + JAVA_HOME=`echo $JAVA_HOME | sed "s,/usr/lib/,/usr/lib$with_multisubdir/,"` | ||
218 | +fi | ||
219 | AM_CONDITIONAL(JAVA_HOME_SET, test ! -z "$JAVA_HOME") | ||
220 | AC_SUBST(JAVA_HOME) | ||
221 | |||
222 | @@ -1385,6 +1388,7 @@ | ||
223 | multi_os_directory=`$CC -print-multi-os-directory` | ||
224 | case $multi_os_directory in | ||
225 | .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /. | ||
226 | + ../lib*) toolexeclibdir='$(subst /lib/../lib,/lib,'$toolexecmainlibdir/$multi_os_directory')' ;; | ||
227 | *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;; | ||
228 | esac | ||
229 | ;; | ||
230 | @@ -1395,6 +1399,7 @@ | ||
231 | |||
232 | # Determine gcj and libgcj version number. | ||
233 | gcjversion=`cat "$srcdir/../gcc/BASE-VER"` | ||
234 | +short_version=`sed -r 's/([[0-9]]+\.[[0-9]]+).*/\1/' $srcdir/../gcc/BASE-VER` | ||
235 | libgcj_soversion=`awk -F: '/^[[^#]].*:/ { print $1 }' $srcdir/libtool-version` | ||
236 | GCJVERSION=$gcjversion | ||
237 | AC_SUBST(GCJVERSION) | ||
238 | @@ -1402,7 +1407,7 @@ | ||
239 | |||
240 | # Determine where the standard .db file and GNU Classpath JNI | ||
241 | # libraries are found. | ||
242 | -gcjsubdir=gcj-$gcjversion-$libgcj_soversion | ||
243 | +gcjsubdir=gcj-$short_version-$libgcj_soversion | ||
244 | multi_os_directory=`$CC -print-multi-os-directory` | ||
245 | case $multi_os_directory in | ||
246 | .) | ||