summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch119
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch280
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch16
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch41
-rw-r--r--recipes-core/openjdk/openjdk-6-release-6b32.inc27
-rw-r--r--recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb6
9 files changed, 526 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch
new file mode 100644
index 0000000..93ca65d
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch
@@ -0,0 +1,119 @@
1Index: icedtea6-1.13.3/Makefile.am
2===================================================================
3--- icedtea6-1.13.3.orig/Makefile.am 2014-06-09 21:46:36.640603938 +0200
4+++ icedtea6-1.13.3/Makefile.am 2014-06-09 21:51:34.228435112 +0200
5@@ -795,6 +795,11 @@
6 JAVAC="" \
7 JAVA_HOME="" \
8 JDK_HOME="" \
9+ OE_CFLAGS="$(OE_CFLAGS)" \
10+ OE_CPPFLAGS="$(OE_CPPFLAGS)" \
11+ OE_CXXFLAGS="$(OE_CXXFLAGS)" \
12+ OE_LDFLAGS="$(OE_LDFLAGS)" \
13+ OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \
14 ANT_RESPECT_JAVA_HOME="TRUE" \
15 DISTRIBUTION_ID="$(DIST_ID)" \
16 DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
17@@ -2025,9 +2030,7 @@
18 rm -f stamps/pax-mark-vm-debug.stamp
19
20 stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm.stamp
21- if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
22- $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
23- fi
24+ $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
25 mkdir -p stamps
26 touch $@
27
28@@ -2035,9 +2038,7 @@
29 rm -f stamps/check-crypto.stamp
30
31 stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm-debug.stamp
32- if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
33- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
34- fi
35+ $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
36 mkdir -p stamps
37 touch $@
38
39@@ -2219,9 +2220,7 @@
40 rm -f stamps/pax-mark-vm-ecj.stamp
41
42 stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm-ecj.stamp
43- if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
44- $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
45- fi
46+ $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
47 mkdir -p stamps
48 touch $@
49
50@@ -2379,10 +2378,14 @@
51 if BUILD_JAMVM
52 cd jamvm/jamvm && \
53 LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
54- ./autogen.sh --with-java-runtime-library=openjdk6 \
55- --prefix=$(abs_top_builddir)/jamvm/install ; \
56- $(MAKE) ; \
57- $(MAKE) install
58+ $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk6 \
59+ --prefix=$(abs_top_builddir)/jamvm/install \
60+ --host=$(host_alias) \
61+ --build=$(build_alias) \
62+ --target=$(target_alias) \
63+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \
64+ $(ARCH_PREFIX) $(MAKE) ; \
65+ $(ARCH_PREFIX) $(MAKE) install
66 mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
67 cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
68 ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
69@@ -2446,6 +2449,7 @@
70 --host=$(host_alias) \
71 --build=$(build_alias) \
72 --target=$(target_alias) \
73+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \
74 --prefix=$(abs_top_builddir)/cacao/install \
75 --with-java-runtime-library=openjdk \
76 --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
77@@ -2514,7 +2518,7 @@
78 # configure script arguments, quoted in single quotes
79 CONFIGURE_ARGS = @CONFIGURE_ARGS@
80 ADD_ZERO_CONFIGURE_ARGS = \
81- --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
82+ --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
83 --enable-zero
84 if ADD_SHARK_BUILD
85 ADD_ZERO_CONFIGURE_ARGS += \
86Index: icedtea6-1.13.3/javac.in
87===================================================================
88--- icedtea6-1.13.3.orig/javac.in 2014-06-09 21:46:36.640603938 +0200
89+++ icedtea6-1.13.3/javac.in 2014-06-09 21:46:36.636603946 +0200
90@@ -40,7 +40,7 @@
91 {
92 my @new_args = @{$_[0]};
93
94- for my $opt (NO_DUP_ARGS)
95+ for my $opt (NO_DUP_ARGS)
96 {
97 my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
98 if (@indices > 1) {
99@@ -49,7 +49,7 @@
100 }
101 }
102
103- for my $opt (STRIP_ARGS)
104+ for my $opt (STRIP_ARGS)
105 {
106 my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
107 splice @new_args, $_, 1 for @indices;
108@@ -91,7 +91,10 @@
109 my @CLASSPATH = ('@ECJ_JAR@');
110 push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
111 $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
112- exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
113+
114+ # Compiling hotspot-tools consumes tons of memory and exceeds any default
115+ # limits for jamvm and cacao.
116+ exec '@JAVA@', '-Xmx1024m', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
117 }
118 else
119 {
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch
new file mode 100644
index 0000000..3b34160
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch
@@ -0,0 +1,280 @@
1diff --git openjdk/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
2index f308203..5ba15dc 100644
3--- openjdk/corba/make/common/Defs-linux.gmk
4+++ openjdk/corba/make/common/Defs-linux.gmk
5@@ -82,9 +82,9 @@ CC_LOWER_OPT = -O2
6 CC_NO_OPT =
7
8 ifeq ($(PRODUCT), java)
9- _OPT = $(CC_HIGHER_OPT)
10+ _OPT = $(OE_CFLAGS)
11 else
12- _OPT = $(CC_LOWER_OPT)
13+ _OPT = $(OE_CFLAGS)
14 CPPFLAGS_DBG += -DLOGGING
15 endif
16
17@@ -94,7 +94,7 @@ endif
18 # as the default.
19 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
20 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
21-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
22+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
23 CFLAGS_REQUIRED_hppa +=
24 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
25 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
26@@ -221,7 +221,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
27 #
28 # -L paths for finding and -ljava
29 #
30-LDFLAGS_OPT = -Xlinker -O1
31+LDFLAGS_OPT = $(OE_LDFLAGS)
32 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
33 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
34
35diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
36index 11de79a..c5751b2 100644
37--- openjdk/hotspot/make/linux/makefiles/gcc.make
38+++ openjdk/hotspot/make/linux/makefiles/gcc.make
39@@ -140,7 +140,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
40 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
41
42 # The flags to use for an Optimized g++ build
43-OPT_CFLAGS += -O3
44+OPT_CFLAGS += $(OE_CFLAGS)
45
46 # Hotspot uses very unstrict aliasing turn this optimization off
47 OPT_CFLAGS += -fno-strict-aliasing
48@@ -184,7 +184,7 @@ LFLAGS += -Wl,-relax
49 endif
50
51 # Enable linker optimization
52-LFLAGS += -Xlinker -O1
53+LFLAGS += $(OE_LDFLAGS)
54
55 # If this is a --hash-style=gnu system, use --hash-style=both
56 # The gnu .hash section won't work on some Linux systems like SuSE 10.
57diff --git openjdk/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
58index 18f65d9..f12a798 100644
59--- openjdk/hotspot/make/linux/makefiles/jsig.make
60+++ openjdk/hotspot/make/linux/makefiles/jsig.make
61@@ -42,7 +42,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
62 # cause problems with interposing. See CR: 6466665
63 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
64
65-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
66+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(OE_LDFLAGS)
67
68 # DEBUG_BINARIES overrides everything, use full -g debug information
69 ifeq ($(DEBUG_BINARIES), true)
70diff --git openjdk/hotspot/make/linux/makefiles/launcher.make openjdk/hotspot/make/linux/makefiles/launcher.make
71index c5cf503..ae7af2e 100644
72--- openjdk/hotspot/make/linux/makefiles/launcher.make
73+++ openjdk/hotspot/make/linux/makefiles/launcher.make
74@@ -50,7 +50,7 @@ ifeq ($(LINK_INTO),AOUT)
75 LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
76 else
77 LAUNCHER.o = launcher.o
78- LFLAGS_LAUNCHER += -L `pwd`
79+ LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS)
80 LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
81 ifeq ($(SHARK_BUILD), true)
82 LFLAGS_LAUNCHER += $(LLVM_LDFLAGS)
83diff --git openjdk/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
84index 4e31797..03a84dd 100644
85--- openjdk/jdk/make/common/Defs-linux.gmk
86+++ openjdk/jdk/make/common/Defs-linux.gmk
87@@ -89,9 +89,9 @@ HPIS = native
88
89 ifndef OPTIMIZATION_LEVEL
90 ifeq ($(PRODUCT), java)
91- OPTIMIZATION_LEVEL = HIGHER
92+ OPTIMIZATION_LEVEL = $(OE_CFLAGS)
93 else
94- OPTIMIZATION_LEVEL = LOWER
95+ OPTIMIZATION_LEVEL = $(OE_CFLAGS)
96 endif
97 endif
98
99@@ -108,7 +108,7 @@ CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
100 # as the default.
101 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
102 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
103-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
104+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
105 CFLAGS_REQUIRED_hppa +=
106 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
107 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
108@@ -249,7 +249,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
109 #
110 # -L paths for finding and -ljava
111 #
112-LDFLAGS_OPT = -Xlinker -O1
113+LDFLAGS_OPT = $(OE_LDFLAGS)
114 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
115 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
116
117diff --git openjdk/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile
118index e462fba..76b56be 100644
119--- openjdk/jdk/make/sun/awt/Makefile
120+++ openjdk/jdk/make/sun/awt/Makefile
121@@ -511,10 +511,10 @@ ifneq ($(PLATFORM), windows)
122 #
123
124 ifeq ($(PLATFORM), linux)
125-CPPFLAGS += -I$(MOTIF_DIR)/include \
126- -I$(OPENWIN_HOME)/include \
127- -I$(OPENWIN_HOME)/include/X11/extensions \
128- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
129+#CPPFLAGS += -I$(MOTIF_DIR)/include \
130+# -I$(OPENWIN_HOME)/include \
131+# -I$(OPENWIN_HOME)/include/X11/extensions \
132+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
133 endif
134 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
135 -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
136@@ -538,7 +538,7 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
137 $(EVENT_MODEL)
138
139 ifeq ($(PLATFORM), linux)
140-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
141+#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
142 endif
143
144 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
145diff --git openjdk/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
146index 44de692..9ce661c 100644
147--- openjdk/jdk/make/sun/awt/mawt.gmk
148+++ openjdk/jdk/make/sun/awt/mawt.gmk
149@@ -196,8 +196,8 @@ endif
150 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
151
152 ifndef HEADLESS
153-CPPFLAGS += -I$(OPENWIN_HOME)/include
154-LDFLAGS += -L$(OPENWIN_LIB)
155+#CPPFLAGS += -I$(OPENWIN_HOME)/include
156+#LDFLAGS += -L$(OPENWIN_LIB)
157
158 endif # !HEADLESS
159
160@@ -225,8 +225,8 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
161
162 ifeq ($(PLATFORM), linux)
163 # Checking for the X11/extensions headers at the additional location
164- CPPFLAGS += -I/X11R6/include/X11/extensions \
165- -I/usr/include/X11/extensions
166+# CPPFLAGS += -I/X11R6/include/X11/extensions \
167+# -I/usr/include/X11/extensions
168 endif
169
170 ifeq ($(PLATFORM), solaris)
171diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
172index 4b4c782..440699b 100644
173--- openjdk/jdk/make/sun/xawt/Makefile
174+++ openjdk/jdk/make/sun/xawt/Makefile
175@@ -129,11 +129,12 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \
176 -I$(PLATFORM_SRC)/native/sun/awt
177
178 ifeq ($(PLATFORM), linux)
179+# Very unsuitable for cross-compilation.
180 # Allows for builds on Debian GNU Linux, X11 is in a different place
181- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
182- -I/usr/include/X11/extensions \
183- -I$(MOTIF_DIR)/include \
184- -I$(OPENWIN_HOME)/include
185+# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
186+# -I/usr/include/X11/extensions \
187+# -I$(MOTIF_DIR)/include \
188+# -I$(OPENWIN_HOME)/include
189 endif
190
191 ifeq ($(PLATFORM), solaris)
192@@ -250,7 +251,7 @@ $(SIZES): $(SIZERS)
193 $(CHMOD) +w $@;\
194 else \
195 $(ECHO) GENERATING $@; \
196- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
197+ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
198 fi
199 @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
200 $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
201diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
202index 440699b..1fa311d 100644
203--- openjdk/jdk/make/sun/xawt/Makefile
204+++ openjdk/jdk/make/sun/xawt/Makefile
205@@ -46,7 +46,7 @@ include FILES_export_unix.gmk
206 AUTO_FILES_JAVA_DIRS = sun/awt/X11
207 AUTO_JAVA_PRUNE = WrapperGenerator.java
208
209-LDFLAGS += -L$(OPENWIN_LIB)
210+#LDFLAGS += -L$(OPENWIN_LIB)
211
212 # For Xrender extension.
213 ifeq ($(PLATFORM), solaris)
214diff --git openjdk/jdk/make/launchers/Makefile.launcher openjdk/jdk/make/launchers/Makefile.launcher
215index f59a9d6..6edc880 100644
216--- openjdk/jdk/make/launchers/Makefile.launcher
217+++ openjdk/jdk/make/launchers/Makefile.launcher
218@@ -152,7 +152,7 @@ endif
219 ifeq ($(GUI_TOOL),true)
220 ifneq ($(PLATFORM), windows)
221 # Anything with a GUI needs X11 to be linked in.
222- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
223+ OTHER_LDLIBS += -lX11
224 endif
225 endif
226
227diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile
228index 2021434..9035da7 100644
229--- openjdk/jdk/make/sun/jawt/Makefile
230+++ openjdk/jdk/make/sun/jawt/Makefile
231@@ -98,8 +98,7 @@ else # PLATFORM
232 #
233 # Other extra flags needed for compiling.
234 #
235-CPPFLAGS += -I$(OPENWIN_HOME)/include \
236- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
237+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
238 -I$(SHARE_SRC)/native/$(PKGDIR)/image \
239 -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
240 -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
241diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
242index 1fa311d..f3d06ad 100644
243--- openjdk/jdk/make/sun/xawt/Makefile
244+++ openjdk/jdk/make/sun/xawt/Makefile
245@@ -232,7 +232,7 @@ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
246
247 $(SIZERS): $(SIZERS_C)
248 $(prep-target)
249- $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
250+ $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -static -o $@ $(SIZER)$(suffix $@).c
251
252 $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
253 $(prep-target)
254diff --git openjdk/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
255index 7271a9e..e441970 100644
256--- openjdk/hotspot/make/linux/makefiles/vm.make
257+++ openjdk/hotspot/make/linux/makefiles/vm.make
258@@ -290,6 +290,7 @@ ifeq ($(SHARK_BUILD), true)
259 LIBS_VM += $(LLVM_LIBS)
260 endif
261
262+LFLAGS_VM += $(OE_LDFLAGS)
263 LINK_VM = $(LINK_LIB.CC)
264
265 # rule for building precompiled header
266diff --git openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
267index d8d89aa..539854a 100644
268--- openjdk/jdk/make/sun/splashscreen/Makefile
269+++ openjdk/jdk/make/sun/splashscreen/Makefile
270@@ -66,8 +66,8 @@ endif
271
272 ifneq ($(PLATFORM), windows)
273 CFLAGS += -DWITH_X11
274- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
275- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
276+ #CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
277+ OTHER_LDLIBS += -lX11 -lXext $(LIBM) -lpthread
278 else # PLATFORM
279 CFLAGS += -DWITH_WIN32
280 OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch
new file mode 100644
index 0000000..917a5b8
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch
@@ -0,0 +1,12 @@
1diff --git openjdk/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
2index 88875b2..2ab8aaf 100644
3--- openjdk/jdk/make/common/shared/Sanity.gmk
4+++ openjdk/jdk/make/common/shared/Sanity.gmk
5@@ -31,6 +31,7 @@
6 # Shared sanity rules for the JDK builds.
7 #
8
9+
10 .SUFFIXES: .hdiffs
11
12 # All files created during sanity checking
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch
new file mode 100644
index 0000000..3d7c619
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch
@@ -0,0 +1,12 @@
1diff --git openjdk/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
2index b40c081..2dfbfc8 100644
3--- openjdk/hotspot/make/linux/makefiles/rules.make
4+++ openjdk/hotspot/make/linux/makefiles/rules.make
5@@ -36,6 +36,7 @@ DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
6 # variables: $(CFLAGS), $(CXXFLAGS) and $(CPPFLAGS).
7 CC_COMPILE = $(CC) $(CXXFLAGS)
8 CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS)
9+CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS)
10
11 AS.S = $(AS) $(ASFLAGS)
12
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch
new file mode 100644
index 0000000..55f1f9c
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch
@@ -0,0 +1,13 @@
1diff --git openjdk/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile
2index eaf8a6e..4938613 100644
3--- openjdk/jdk/make/com/sun/jmx/Makefile
4+++ openjdk/jdk/make/com/sun/jmx/Makefile
5@@ -102,7 +102,7 @@ FILES_ties = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/
6 # when available, we need to run with latest rmic version available. rmic
7 # launch tool not built at this stage but we can invoke via rmi class.
8
9-RMIC_JAVA = $(OUTPUTDIR)/bin/java
10+RMIC_JAVA = $(BOOTDIR)/bin/java
11 # need to treat 64bit solaris differently
12 ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
13 RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch
new file mode 100644
index 0000000..cab80ac
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch
@@ -0,0 +1,16 @@
1diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
2index 8986146..846bd6b 100644
3--- openjdk/hotspot/make/linux/makefiles/gcc.make
4+++ openjdk/hotspot/make/linux/makefiles/gcc.make
5@@ -132,11 +132,6 @@ else
6 CFLAGS += -pipe
7 endif
8
9-# Compiler warnings are treated as errors
10-ifneq ($(COMPILER_WARNINGS_FATAL),false)
11-WARNINGS_ARE_ERRORS = -Werror
12-endif
13-
14 # Except for a few acceptable ones
15 # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
16 # conversions which might affect the values. To avoid that, we need to turn
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch
new file mode 100644
index 0000000..91ace0e
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch
@@ -0,0 +1,41 @@
1diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
2index c2a1484..f460d85 100644
3--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
4+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
5@@ -32,13 +32,20 @@ Obj_Files += cppInterpreter_arm.o
6 Obj_Files += thumb2.o
7
8 CFLAGS += -DHOTSPOT_ASM
9+CCFLAGS += -DHOTSPOT_ASM
10+
11+ifeq ($(CROSS_COMPILATION), true)
12+ C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD)
13+else
14+ C_COMPILE_FOR_MKBC = $(C_COMPILE)
15+endif
16
17 cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
18 thumb2.o: offsets_arm.s
19
20 offsets_arm.s: mkoffsets
21 @echo Generating assembler offsets
22- ./mkoffsets > $@
23+ $(QEMU) ./mkoffsets > $@
24
25 bytecodes_arm.s: bytecodes_arm.def mkbc
26 @echo Generating ARM assembler bytecode sequences
27@@ -46,12 +53,12 @@ bytecodes_arm.s: bytecodes_arm.def mkbc
28
29 mkbc: $(GAMMADIR)/tools/mkbc.c
30 @echo Compiling mkbc tool
31- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
32+ $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE)
33
34 mkoffsets: asm_helper.cpp
35 @echo Compiling offset generator
36 $(QUIETLY) $(REMOVE_TARGET)
37- $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
38+ $(CC_COMPILE) $(CFLAGS) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
39
40 endif
41
diff --git a/recipes-core/openjdk/openjdk-6-release-6b32.inc b/recipes-core/openjdk/openjdk-6-release-6b32.inc
new file mode 100644
index 0000000..fb7fb35
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-release-6b32.inc
@@ -0,0 +1,27 @@
1require openjdk-6-release-6b27.inc
2
3DEPENDS += "krb5"
4
5FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b32:"
6
7EXTRA_OECONF += "--disable-downloading \
8 --enable-system-zlib \
9 --enable-system-jpeg \
10 --enable-system-png \
11 --enable-system-gif \
12 "
13
14OPENJDK_VERSION = "b32"
15OPENJDK_DATE = "15_jul_2014"
16#https://java.net/projects/openjdk6/downloads/download/openjdk-6-src-b31-15_apr_2014.tar.gz
17OPENJDK_URI = "https://java.net/projects/openjdk6/downloads/download/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz;subdir=openjdk-src-dir;name=openjdk;unpack=false"
18SRC_URI[openjdk.md5sum] = "a97c28256a61be76e3047c31e0349c04"
19SRC_URI[openjdk.sha256sum] = "fe1eb7053fddfd325152f95f9719325e4ba67534a26fa690ca24fab75461a1fa"
20
21JAMVM_VERSION = "ec18fb9e49e62dce16c5094ef1527eed619463aa"
22SRC_URI[jamvm.md5sum] = "d50ae193d01a9251e10679c7a2cc6ff1"
23SRC_URI[jamvm.sha256sum] = "31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc"
24
25JAXP_FILE = "jaxp144_04.zip"
26SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd"
27SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c"
diff --git a/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb b/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb
new file mode 100644
index 0000000..69a3e1e
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb
@@ -0,0 +1,6 @@
1require openjdk-6-release-6b32.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[iced.md5sum] = "95d61221d0be3616c8c04d164df524a4"
6SRC_URI[iced.sha256sum] = "302b17575ad98bbf6a1d4d8768d2ea1f1b070f153c660ebe493b6509d56ed0e7"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-13 07:24:41 +0000