diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2011-11-12 20:58:34 +0100 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2011-11-26 23:41:44 +0100 |
commit | 57e069cde6617f00ca8834a82c6f360af43d5067 (patch) | |
tree | 48cbe15e96d217c45acfa64b0c13aad8c6424980 /recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch | |
download | meta-java-57e069cde6617f00ca8834a82c6f360af43d5067.tar.gz |
meta-java: initial commit
* taken over mostly stuff from oe classic
* cleaned up recipes
* added license checksums
* bump icedtea6-native to 1.8.11
* use jamvm from git as native
Diffstat (limited to 'recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch')
-rw-r--r-- | recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch | 240 |
1 files changed, 240 insertions, 0 deletions
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch new file mode 100644 index 0000000..5c989f9 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch | |||
@@ -0,0 +1,240 @@ | |||
1 | From 662e11a8b6017f39ceb6d00dcdbfe11473b56174 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Fri, 23 Oct 2009 18:06:43 +0200 | ||
4 | Subject: [PATCH] sane-arch2 | ||
5 | |||
6 | --- | ||
7 | openjdk/jdk/make/common/shared/Compiler-gcc.gmk | 4 ++-- | ||
8 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git openjdk/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
11 | index 8329530..de85a11 100644 | ||
12 | --- openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
13 | +++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
14 | @@ -90,8 +90,8 @@ ifeq ($(PLATFORM), linux) | ||
15 | REQUIRED_CC_VER = 3.2 | ||
16 | REQUIRED_GCC_VER = 3.2.* | ||
17 | endif | ||
18 | - ifeq ($(ARCH), i586) | ||
19 | - # i586 | ||
20 | + ifeq ($(ARCH), x86) | ||
21 | + # x86 | ||
22 | REQUIRED_CC_VER = 3.2 | ||
23 | REQUIRED_GCC_VER = 3.2.1* | ||
24 | REQUIRED_GCC_VER_INT = 3.2.1-7a | ||
25 | -- | ||
26 | 1.6.5 | ||
27 | |||
28 | From e2e87228dd36bd737b52ed3daeaed526b5e4d3ea Mon Sep 17 00:00:00 2001 | ||
29 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
30 | Date: Fri, 23 Oct 2009 18:16:54 +0200 | ||
31 | Subject: [PATCH] sane-arch3 | ||
32 | |||
33 | --- | ||
34 | jdk/src/solaris/bin/i586/jvm.cfg | 38 -------------------------------------- | ||
35 | jdk/src/solaris/bin/x86/jvm.cfg | 38 ++++++++++++++++++++++++++++++++++++++ | ||
36 | 2 files changed, 38 insertions(+), 38 deletions(-) | ||
37 | delete mode 100644 jdk/src/solaris/bin/i586/jvm.cfg | ||
38 | create mode 100644 jdk/src/solaris/bin/x86/jvm.cfg | ||
39 | |||
40 | diff --git openjdk/jdk/src/solaris/bin/i586/jvm.cfg openjdk/jdk/src/solaris/bin/i586/jvm.cfg | ||
41 | deleted file mode 100644 | ||
42 | index b97e5ae..0000000 | ||
43 | --- openjdk/jdk/src/solaris/bin/i586/jvm.cfg | ||
44 | +++ /dev/null | ||
45 | @@ -1,38 +0,0 @@ | ||
46 | -# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
47 | -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
48 | -# | ||
49 | -# This code is free software; you can redistribute it and/or modify it | ||
50 | -# under the terms of the GNU General Public License version 2 only, as | ||
51 | -# published by the Free Software Foundation. Sun designates this | ||
52 | -# particular file as subject to the "Classpath" exception as provided | ||
53 | -# by Sun in the LICENSE file that accompanied this code. | ||
54 | -# | ||
55 | -# This code is distributed in the hope that it will be useful, but WITHOUT | ||
56 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
57 | -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
58 | -# version 2 for more details (a copy is included in the LICENSE file that | ||
59 | -# accompanied this code). | ||
60 | -# | ||
61 | -# You should have received a copy of the GNU General Public License version | ||
62 | -# 2 along with this work; if not, write to the Free Software Foundation, | ||
63 | -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
64 | -# | ||
65 | -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
66 | -# CA 95054 USA or visit www.sun.com if you need additional information or | ||
67 | -# have any questions. | ||
68 | -# | ||
69 | -# List of JVMs that can be used as an option to java, javac, etc. | ||
70 | -# Order is important -- first in this list is the default JVM. | ||
71 | -# NOTE that this both this file and its format are UNSUPPORTED and | ||
72 | -# WILL GO AWAY in a future release. | ||
73 | -# | ||
74 | -# You may also select a JVM in an arbitrary location with the | ||
75 | -# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
76 | -# and may not be available in a future release. | ||
77 | -# | ||
78 | --client IF_SERVER_CLASS -server | ||
79 | --server KNOWN | ||
80 | --hotspot ALIASED_TO -client | ||
81 | --classic WARN | ||
82 | --native ERROR | ||
83 | --green ERROR | ||
84 | diff --git openjdk/jdk/src/solaris/bin/x86/jvm.cfg openjdk/jdk/src/solaris/bin/x86/jvm.cfg | ||
85 | new file mode 100644 | ||
86 | index 0000000..b97e5ae | ||
87 | --- /dev/null | ||
88 | +++ openjdk/jdk/src/solaris/bin/x86/jvm.cfg | ||
89 | @@ -0,0 +1,38 @@ | ||
90 | +# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
91 | +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
92 | +# | ||
93 | +# This code is free software; you can redistribute it and/or modify it | ||
94 | +# under the terms of the GNU General Public License version 2 only, as | ||
95 | +# published by the Free Software Foundation. Sun designates this | ||
96 | +# particular file as subject to the "Classpath" exception as provided | ||
97 | +# by Sun in the LICENSE file that accompanied this code. | ||
98 | +# | ||
99 | +# This code is distributed in the hope that it will be useful, but WITHOUT | ||
100 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
101 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
102 | +# version 2 for more details (a copy is included in the LICENSE file that | ||
103 | +# accompanied this code). | ||
104 | +# | ||
105 | +# You should have received a copy of the GNU General Public License version | ||
106 | +# 2 along with this work; if not, write to the Free Software Foundation, | ||
107 | +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
108 | +# | ||
109 | +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
110 | +# CA 95054 USA or visit www.sun.com if you need additional information or | ||
111 | +# have any questions. | ||
112 | +# | ||
113 | +# List of JVMs that can be used as an option to java, javac, etc. | ||
114 | +# Order is important -- first in this list is the default JVM. | ||
115 | +# NOTE that this both this file and its format are UNSUPPORTED and | ||
116 | +# WILL GO AWAY in a future release. | ||
117 | +# | ||
118 | +# You may also select a JVM in an arbitrary location with the | ||
119 | +# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
120 | +# and may not be available in a future release. | ||
121 | +# | ||
122 | +-client IF_SERVER_CLASS -server | ||
123 | +-server KNOWN | ||
124 | +-hotspot ALIASED_TO -client | ||
125 | +-classic WARN | ||
126 | +-native ERROR | ||
127 | +-green ERROR | ||
128 | -- | ||
129 | 1.6.5 | ||
130 | |||
131 | From d5274fb90454c0e40b665d865f456430949791c4 Mon Sep 17 00:00:00 2001 | ||
132 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
133 | Date: Fri, 23 Oct 2009 18:42:11 +0200 | ||
134 | Subject: [PATCH 2/4] sane-arch4 | ||
135 | |||
136 | --- | ||
137 | .../share/native/com/sun/mediopenjdk/sound/SoundDefs.h | 2 +- | ||
138 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
139 | |||
140 | diff --git openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h | ||
141 | index 94624e0..6522503 100644 | ||
142 | --- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h | ||
143 | +++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h | ||
144 | @@ -36,7 +36,7 @@ | ||
145 | #define X_ALPHA 1 | ||
146 | #define X_AMD64 2 | ||
147 | #define X_ARM 3 | ||
148 | -#define X_I586 4 | ||
149 | +#define X_X86 4 | ||
150 | #define X_IA64 5 | ||
151 | #define X_M68K 6 | ||
152 | #define X_MIPS 7 | ||
153 | -- | ||
154 | 1.6.5 | ||
155 | |||
156 | From 251338c93253d1026a37df2793956d7985f9f4eb Mon Sep 17 00:00:00 2001 | ||
157 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
158 | Date: Fri, 23 Oct 2009 18:44:13 +0200 | ||
159 | Subject: [PATCH 4/4] sane-arch4 | ||
160 | |||
161 | --- | ||
162 | jdk/make/javax/sound/SoundDefs.gmk | 6 +++--- | ||
163 | 1 files changed, 3 insertions(+), 3 deletions(-) | ||
164 | |||
165 | diff --git openjdk/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk | ||
166 | index 22ad8e0..a54ecd5 100644 | ||
167 | --- openjdk/jdk/make/javax/sound/SoundDefs.gmk | ||
168 | +++ openjdk/jdk/make/javax/sound/SoundDefs.gmk | ||
169 | @@ -70,9 +70,9 @@ else | ||
170 | CPPFLAGS += -DX_ARCH=X_ARM | ||
171 | endif # ARCH arm | ||
172 | |||
173 | - ifeq ($(ARCH), i586) | ||
174 | - CPPFLAGS += -DX_ARCH=X_I586 | ||
175 | - endif # ARCH i586 | ||
176 | + ifeq ($(ARCH), x86) | ||
177 | + CPPFLAGS += -DX_ARCH=X_X86 | ||
178 | + endif # ARCH x86 | ||
179 | |||
180 | ifeq ($(ARCH), ia64) | ||
181 | CPPFLAGS += -DX_ARCH=X_IA64 | ||
182 | -- | ||
183 | 1.6.5 | ||
184 | |||
185 | Index: openjdk/jdk/make/common/shared/Platform.gmk | ||
186 | =================================================================== | ||
187 | --- openjdk/jdk/make/common/shared/Platform.gmk 2009-10-23 22:17:12.749059413 +0200 | ||
188 | +++ openjdk/jdk/make/common/shared/Platform.gmk 2009-10-23 22:18:16.236579466 +0200 | ||
189 | @@ -56,8 +56,8 @@ | ||
190 | # OS_VENDOR company name | ||
191 | # TEMP_DISK /tmp or C:/temp | ||
192 | # ARCH_DATA_MODEL 32 or 64 | ||
193 | -# ARCH sparc, sparcv9, i586, amd64, or ia64 | ||
194 | -# ARCH_FAMILY sparc or i586 | ||
195 | +# ARCH sparc, sparcv9, x86, amd64, or ia64 | ||
196 | +# ARCH_FAMILY sparc or x86 | ||
197 | # ARCHPROP sparc or x86 | ||
198 | # ARCH_VM_SUBDIR jre/bin, jre/lib/sparc, etc. | ||
199 | # LIBARCH sparc, sparcv9, i386, amd64, or ia64 | ||
200 | @@ -200,7 +200,7 @@ | ||
201 | endif | ||
202 | archExpr = case "$(mach)" in \ | ||
203 | i[3-9]86) \ | ||
204 | - echo i586 \ | ||
205 | + echo x86 \ | ||
206 | ;; \ | ||
207 | ia64) \ | ||
208 | echo ia64 \ | ||
209 | @@ -239,7 +239,7 @@ | ||
210 | ARCH=sparcv9 | ||
211 | endif | ||
212 | else | ||
213 | - # i586 is 32-bit, amd64 is 64-bit | ||
214 | + # x86 is 32-bit, amd64 is 64-bit | ||
215 | ifndef ARCH_DATA_MODEL | ||
216 | ifeq ($(ARCH), alpha) | ||
217 | ARCH_DATA_MODEL=64 | ||
218 | @@ -250,7 +250,7 @@ | ||
219 | ifeq ($(ARCH), arm) | ||
220 | ARCH_DATA_MODEL=32 | ||
221 | endif | ||
222 | - ifeq ($(ARCH), i586) | ||
223 | + ifeq ($(ARCH), x86) | ||
224 | ARCH_DATA_MODEL=32 | ||
225 | endif | ||
226 | ifeq ($(ARCH), ia64) | ||
227 | @@ -280,12 +280,7 @@ | ||
228 | endif | ||
229 | endif | ||
230 | |||
231 | - # Need to maintain the jre/lib/i386 location for 32-bit Intel | ||
232 | - ifeq ($(ARCH), i586) | ||
233 | - LIBARCH = i386 | ||
234 | - else | ||
235 | - LIBARCH = $(ARCH) | ||
236 | - endif | ||
237 | + LIBARCH = $(ARCH) | ||
238 | |||
239 | # Value of Java os.arch property | ||
240 | ARCHPROP = $(LIBARCH) | ||