summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorHenning Heinold <henning@itconsulting-heinold.de>2014-02-28 09:08:12 +0100
committerHenning Heinold <henning@itconsulting-heinold.de>2014-03-05 20:11:32 +0100
commit1d32108a952b350579ce5ddf298353ec8b3e47b8 (patch)
treea9fb5051748991b884348ae8e8db514bb2ca7b50 /recipes-core
parent23bf359e99e8ee0d11b7928454824cfc18b16944 (diff)
downloadmeta-java-1d32108a952b350579ce5ddf298353ec8b3e47b8.tar.gz
openjdk6: update icedtea 1.12 to version 1.12.8
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch456
-rw-r--r--recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch34
-rw-r--r--recipes-core/openjdk/openjdk-6-common.inc1
-rw-r--r--recipes-core/openjdk/openjdk-6-release-6b27.inc8
-rw-r--r--recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb6
-rw-r--r--recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb6
6 files changed, 503 insertions, 8 deletions
diff --git a/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch
new file mode 100644
index 0000000..09db502
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch
@@ -0,0 +1,456 @@
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/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make
36index 4ba1f0e..48cfb02 100644
37--- openjdk/hotspot/make/linux/makefiles/buildtree.make
38+++ openjdk/hotspot/make/linux/makefiles/buildtree.make
39@@ -380,7 +380,7 @@ test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
40 echo "rm -f Queens.class"; \
41 echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
42 echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
43- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
44+ echo 'echo Silently skipping the execution of the gamma program'; \
45 ) > $@
46 $(QUIETLY) chmod +x $@
47
48diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
49index 11de79a..c5751b2 100644
50--- openjdk/hotspot/make/linux/makefiles/gcc.make
51+++ openjdk/hotspot/make/linux/makefiles/gcc.make
52@@ -140,7 +140,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
53 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
54
55 # The flags to use for an Optimized g++ build
56-OPT_CFLAGS += -O3
57+OPT_CFLAGS += $(OE_CFLAGS)
58
59 # Hotspot uses very unstrict aliasing turn this optimization off
60 OPT_CFLAGS += -fno-strict-aliasing
61@@ -184,7 +184,7 @@ LFLAGS += -Wl,-relax
62 endif
63
64 # Enable linker optimization
65-LFLAGS += -Xlinker -O1
66+LFLAGS += $(OE_LDFLAGS)
67
68 # If this is a --hash-style=gnu system, use --hash-style=both
69 # The gnu .hash section won't work on some Linux systems like SuSE 10.
70diff --git openjdk/hotspot/make/linux/makefiles/gcc.make.orig openjdk/hotspot/make/linux/makefiles/gcc.make.orig
71index 3d6a6b7..11de79a 100644
72--- openjdk/hotspot/make/linux/makefiles/gcc.make.orig
73+++ openjdk/hotspot/make/linux/makefiles/gcc.make.orig
74@@ -204,7 +204,7 @@ SONAMEFLAG = -Xlinker -soname=SONAME
75 SHARED_FLAG = -shared
76
77 # Keep symbols even they are not used
78-AOUT_FLAGS += -export-dynamic
79+AOUT_FLAGS += -Xlinker -export-dynamic
80
81 #------------------------------------------------------------------------
82 # Debug flags
83diff --git openjdk/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
84index 18f65d9..f12a798 100644
85--- openjdk/hotspot/make/linux/makefiles/jsig.make
86+++ openjdk/hotspot/make/linux/makefiles/jsig.make
87@@ -42,7 +42,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
88 # cause problems with interposing. See CR: 6466665
89 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
90
91-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
92+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(OE_LDFLAGS)
93
94 # DEBUG_BINARIES overrides everything, use full -g debug information
95 ifeq ($(DEBUG_BINARIES), true)
96diff --git openjdk/hotspot/make/linux/makefiles/launcher.make openjdk/hotspot/make/linux/makefiles/launcher.make
97index c5cf503..ae7af2e 100644
98--- openjdk/hotspot/make/linux/makefiles/launcher.make
99+++ openjdk/hotspot/make/linux/makefiles/launcher.make
100@@ -50,7 +50,7 @@ ifeq ($(LINK_INTO),AOUT)
101 LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
102 else
103 LAUNCHER.o = launcher.o
104- LFLAGS_LAUNCHER += -L `pwd`
105+ LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS)
106 LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
107 ifeq ($(SHARK_BUILD), true)
108 LFLAGS_LAUNCHER += $(LLVM_LDFLAGS)
109diff --git openjdk/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
110index cd8d9ef..b00ce46 100644
111--- openjdk/hotspot/make/linux/makefiles/vm.make
112+++ openjdk/hotspot/make/linux/makefiles/vm.make
113@@ -242,6 +242,7 @@ ifeq ($(SHARK_BUILD), true)
114 LIBS_VM += $(LLVM_LIBS)
115 endif
116
117+LFLAGS_VM += $(OE_LDFLAGS)
118 LINK_VM = $(LINK_LIB.c)
119
120 # rule for building precompiled header
121diff --git openjdk/hotspot/make/linux/makefiles/vm.make.orig openjdk/hotspot/make/linux/makefiles/vm.make.orig
122index fa4116a..cd8d9ef 100644
123--- openjdk/hotspot/make/linux/makefiles/vm.make.orig
124+++ openjdk/hotspot/make/linux/makefiles/vm.make.orig
125@@ -143,13 +143,15 @@ COMPILER2_PATHS := $(GAMMADIR)/src/share/vm/opto
126 COMPILER2_PATHS += $(GAMMADIR)/src/share/vm/libadt
127 COMPILER2_PATHS += $(GENERATED)/adfiles
128
129+SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
130+
131 # Include dirs per type.
132 Src_Dirs/CORE := $(CORE_PATHS)
133 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
134 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
135 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
136 Src_Dirs/ZERO := $(CORE_PATHS)
137-Src_Dirs/SHARK := $(CORE_PATHS)
138+Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
139 Src_Dirs := $(Src_Dirs/$(TYPE))
140
141 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
142diff --git openjdk/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
143index 4e31797..03a84dd 100644
144--- openjdk/jdk/make/common/Defs-linux.gmk
145+++ openjdk/jdk/make/common/Defs-linux.gmk
146@@ -89,9 +89,9 @@ HPIS = native
147
148 ifndef OPTIMIZATION_LEVEL
149 ifeq ($(PRODUCT), java)
150- OPTIMIZATION_LEVEL = HIGHER
151+ OPTIMIZATION_LEVEL = $(OE_CFLAGS)
152 else
153- OPTIMIZATION_LEVEL = LOWER
154+ OPTIMIZATION_LEVEL = $(OE_CFLAGS)
155 endif
156 endif
157
158@@ -108,7 +108,7 @@ CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
159 # as the default.
160 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
161 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
162-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
163+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
164 CFLAGS_REQUIRED_hppa +=
165 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
166 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
167@@ -249,7 +249,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
168 #
169 # -L paths for finding and -ljava
170 #
171-LDFLAGS_OPT = -Xlinker -O1
172+LDFLAGS_OPT = $(OE_LDFLAGS)
173 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
174 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
175
176diff --git openjdk/jdk/make/common/Defs-linux.gmk.orig openjdk/jdk/make/common/Defs-linux.gmk.orig
177index cbbf647..4e31797 100644
178--- openjdk/jdk/make/common/Defs-linux.gmk.orig
179+++ openjdk/jdk/make/common/Defs-linux.gmk.orig
180@@ -86,18 +86,22 @@ HPIS = native
181 #
182 # Default optimization
183 #
184-CC_HIGHEST_OPT = -O3
185-CC_HIGHER_OPT = -O3
186-CC_LOWER_OPT = -O2
187-CC_NO_OPT =
188
189-ifeq ($(PRODUCT), java)
190- _OPT = $(CC_HIGHER_OPT)
191-else
192- _OPT = $(CC_LOWER_OPT)
193- CPPFLAGS_DBG += -DLOGGING
194+ifndef OPTIMIZATION_LEVEL
195+ ifeq ($(PRODUCT), java)
196+ OPTIMIZATION_LEVEL = HIGHER
197+ else
198+ OPTIMIZATION_LEVEL = LOWER
199+ endif
200 endif
201
202+CC_OPT/NONE =
203+CC_OPT/LOWER = -O2
204+CC_OPT/HIGHER = -O3
205+CC_OPT/HIGHEST = -O3
206+
207+CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
208+
209 # For all platforms, do not omit the frame pointer register usage.
210 # We need this frame pointer to make it easy to walk the stacks.
211 # This should be the default on X86, but ia64 and amd64 may not have this
212@@ -131,17 +135,13 @@ else
213 LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
214 endif
215
216-# Add in platform specific optimizations for all opt levels
217-CC_HIGHEST_OPT += $(_OPT_$(ARCH))
218-CC_HIGHER_OPT += $(_OPT_$(ARCH))
219-CC_LOWER_OPT += $(_OPT_$(ARCH))
220-
221-# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off
222-ifdef NO_OPTIMIZATIONS
223- CC_HIGHEST_OPT = $(CC_NO_OPT)
224- CC_HIGHER_OPT = $(CC_NO_OPT)
225- CC_LOWER_OPT = $(CC_NO_OPT)
226+# If this is a --hash-style=gnu system, use --hash-style=both
227+# The gnu .hash section won't work on some Linux systems like SuSE 10.
228+_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | $(GREP) -- '--hash-style=gnu')
229+ifneq ($(_HAS_HASH_STYLE_GNU),)
230+ LDFLAGS_HASH_STYLE = -Wl,--hash-style=both
231 endif
232+LDFLAGS_COMMON += $(LDFLAGS_HASH_STYLE)
233
234 #
235 # Selection of warning messages
236@@ -188,19 +188,19 @@ ifeq ($(DEBUG_BINARIES), true)
237 CFLAGS_REQUIRED += $(DEBUG_FLAG)
238 endif
239
240-CFLAGS_OPT = $(POPT)
241+CFLAGS_OPT = $(CC_OPT)
242 CFLAGS_DBG = $(DEBUG_FLAG)
243 CFLAGS_COMMON += $(CFLAGS_REQUIRED)
244
245 CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
246-CXXFLAGS_OPT = $(POPT)
247+CXXFLAGS_OPT = $(CC_OPT)
248 CXXFLAGS_DBG = $(DEBUG_FLAG)
249 CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
250
251 # FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java
252 ifeq ($(FASTDEBUG), true)
253- CFLAGS_DBG += $(CC_LOWER_OPT)
254- CXXFLAGS_DBG += $(CC_LOWER_OPT)
255+ CFLAGS_DBG += $(CC_OPT/LOWER)
256+ CXXFLAGS_DBG += $(CC_OPT/LOWER)
257 endif
258
259 CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
260@@ -221,6 +221,9 @@ endif
261
262 CPPFLAGS_OPT =
263 CPPFLAGS_DBG = -DDEBUG
264+ifneq ($(PRODUCT), java)
265+ CPPFLAGS_DBG += -DLOGGING
266+endif
267
268 ifdef LIBRARY
269 # Libraries need to locate other libraries at runtime, and you can tell
270@@ -255,9 +258,8 @@ LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
271 # statically link libgcc but will print a warning with the flag. We don't
272 # want the warning, so check gcc version first.
273 #
274-CC_VER_MAJOR := $(shell $(CC) -dumpversion | $(SED) 's/egcs-//' | $(CUT) -d'.' -f1)
275-ifeq ("$(CC_VER_MAJOR)", "3")
276-OTHER_LDFLAGS += -static-libgcc
277+ifeq ($(CC_MAJORVER),3)
278+ OTHER_LDFLAGS += -static-libgcc
279 endif
280
281 # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
282diff --git openjdk/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile
283index e462fba..76b56be 100644
284--- openjdk/jdk/make/sun/awt/Makefile
285+++ openjdk/jdk/make/sun/awt/Makefile
286@@ -511,10 +511,10 @@ ifneq ($(PLATFORM), windows)
287 #
288
289 ifeq ($(PLATFORM), linux)
290-CPPFLAGS += -I$(MOTIF_DIR)/include \
291- -I$(OPENWIN_HOME)/include \
292- -I$(OPENWIN_HOME)/include/X11/extensions \
293- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
294+#CPPFLAGS += -I$(MOTIF_DIR)/include \
295+# -I$(OPENWIN_HOME)/include \
296+# -I$(OPENWIN_HOME)/include/X11/extensions \
297+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
298 endif
299 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
300 -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
301@@ -538,7 +538,7 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
302 $(EVENT_MODEL)
303
304 ifeq ($(PLATFORM), linux)
305-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
306+#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
307 endif
308
309 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
310diff --git openjdk/jdk/make/sun/awt/Makefile.orig openjdk/jdk/make/sun/awt/Makefile.orig
311index 61f36cd..e462fba 100644
312--- openjdk/jdk/make/sun/awt/Makefile.orig
313+++ openjdk/jdk/make/sun/awt/Makefile.orig
314@@ -28,17 +28,13 @@ PACKAGE = sun.awt
315 LIBRARY = awt
316 PRODUCT = sun
317
318-#
319 # Tell Defs.gmk that VIS is needed
320-#
321 VIS_NEEDED=true
322
323-include $(BUILDDIR)/common/Defs.gmk
324-
325-#
326 # Use highest optimization level
327-#
328-_OPT = $(CC_HIGHEST_OPT)
329+OPTMIZATION_LEVEL = HIGHEST
330+
331+include $(BUILDDIR)/common/Defs.gmk
332
333 OTHER_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES
334
335@@ -388,6 +384,10 @@ _FONTCONFIGS = \
336 fontconfig.SuSE.properties \
337 fontconfig.Ubuntu.properties \
338 fontconfig.Fedora.properties \
339+ fontconfig.Fedora.9.properties \
340+ fontconfig.Fedora.10.properties \
341+ fontconfig.Fedora.11.properties \
342+ fontconfig.Fedora.12.properties \
343 fontconfig.RedHat.6.properties \
344 fontconfig.Gentoo.properties
345 else
346diff --git openjdk/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
347index 44de692..9ce661c 100644
348--- openjdk/jdk/make/sun/awt/mawt.gmk
349+++ openjdk/jdk/make/sun/awt/mawt.gmk
350@@ -196,8 +196,8 @@ endif
351 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
352
353 ifndef HEADLESS
354-CPPFLAGS += -I$(OPENWIN_HOME)/include
355-LDFLAGS += -L$(OPENWIN_LIB)
356+#CPPFLAGS += -I$(OPENWIN_HOME)/include
357+#LDFLAGS += -L$(OPENWIN_LIB)
358
359 endif # !HEADLESS
360
361@@ -225,8 +225,8 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
362
363 ifeq ($(PLATFORM), linux)
364 # Checking for the X11/extensions headers at the additional location
365- CPPFLAGS += -I/X11R6/include/X11/extensions \
366- -I/usr/include/X11/extensions
367+# CPPFLAGS += -I/X11R6/include/X11/extensions \
368+# -I/usr/include/X11/extensions
369 endif
370
371 ifeq ($(PLATFORM), solaris)
372diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
373index 4b4c782..440699b 100644
374--- openjdk/jdk/make/sun/xawt/Makefile
375+++ openjdk/jdk/make/sun/xawt/Makefile
376@@ -129,11 +129,12 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \
377 -I$(PLATFORM_SRC)/native/sun/awt
378
379 ifeq ($(PLATFORM), linux)
380+# Very unsuitable for cross-compilation.
381 # Allows for builds on Debian GNU Linux, X11 is in a different place
382- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
383- -I/usr/include/X11/extensions \
384- -I$(MOTIF_DIR)/include \
385- -I$(OPENWIN_HOME)/include
386+# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
387+# -I/usr/include/X11/extensions \
388+# -I$(MOTIF_DIR)/include \
389+# -I$(OPENWIN_HOME)/include
390 endif
391
392 ifeq ($(PLATFORM), solaris)
393@@ -250,7 +251,7 @@ $(SIZES): $(SIZERS)
394 $(CHMOD) +w $@;\
395 else \
396 $(ECHO) GENERATING $@; \
397- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
398+ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
399 fi
400 @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
401 $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
402diff --git openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
403index 6693e2a..494a646 100644
404--- openjdk/jdk/make/sun/splashscreen/Makefile
405+++ openjdk/jdk/make/sun/splashscreen/Makefile
406@@ -63,8 +63,8 @@ CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
407
408 ifneq ($(PLATFORM), windows)
409 CFLAGS += -DWITH_X11
410- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
411- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
412+ #CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
413+ OTHER_LDLIBS += -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
414 else # PLATFORM
415 CFLAGS += -DWITH_WIN32
416 OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
417diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
418index 440699b..1fa311d 100644
419--- openjdk/jdk/make/sun/xawt/Makefile
420+++ openjdk/jdk/make/sun/xawt/Makefile
421@@ -46,7 +46,7 @@ include FILES_export_unix.gmk
422 AUTO_FILES_JAVA_DIRS = sun/awt/X11
423 AUTO_JAVA_PRUNE = WrapperGenerator.java
424
425-LDFLAGS += -L$(OPENWIN_LIB)
426+#LDFLAGS += -L$(OPENWIN_LIB)
427
428 # For Xrender extension.
429 ifeq ($(PLATFORM), solaris)
430diff --git openjdk/jdk/make/launchers/Makefile.launcher openjdk/jdk/make/launchers/Makefile.launcher
431index f59a9d6..6edc880 100644
432--- openjdk/jdk/make/launchers/Makefile.launcher
433+++ openjdk/jdk/make/launchers/Makefile.launcher
434@@ -152,7 +152,7 @@ endif
435 ifeq ($(GUI_TOOL),true)
436 ifneq ($(PLATFORM), windows)
437 # Anything with a GUI needs X11 to be linked in.
438- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
439+ OTHER_LDLIBS += -lX11
440 endif
441 endif
442
443diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile
444index 2021434..9035da7 100644
445--- openjdk/jdk/make/sun/jawt/Makefile
446+++ openjdk/jdk/make/sun/jawt/Makefile
447@@ -98,8 +98,7 @@ else # PLATFORM
448 #
449 # Other extra flags needed for compiling.
450 #
451-CPPFLAGS += -I$(OPENWIN_HOME)/include \
452- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
453+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
454 -I$(SHARE_SRC)/native/$(PKGDIR)/image \
455 -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
456 -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
diff --git a/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch b/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch
new file mode 100644
index 0000000..0d3ce04
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch
@@ -0,0 +1,34 @@
1diff --git openjdk/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
2index 55c0e88..220aa5c 100644
3--- openjdk/jdk/make/common/shared/Sanity.gmk
4+++ openjdk/jdk/make/common/shared/Sanity.gmk
5@@ -102,11 +102,6 @@ ifeq ($(PLATFORM), linux)
6 if [ "$(OS_VARIANT_NAME)" = "Fedora" ] ; then \
7 $(CAT) /etc/fedora-release | $(HEAD) -1 | $(NAWK) '{ print $$3; }' ; \
8 fi)
9- ALSA_INCLUDE=/usr/include/alsa/version.h
10- ALSA_LIBRARY=/usr/lib/libasound.so
11- _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
12- $(SED) -e 's@.*\"\(.*\)\".*@\1@' )
13- ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
14 endif
15
16 ifeq ($(PLATFORM), windows)
17@@ -210,7 +210,6 @@ endif
18 sane-compiler \
19 sane-link \
20 sane-cacerts \
21- sane-alsa-headers \
22 sane-ant_version \
23 sane-zip_version \
24 sane-unzip_version \
25@@ -1351,9 +1346,6 @@ endif
26 # need /usr/include/alsa/version.h and /usr/lib/libasound.so
27 ######################################################
28
29-ifdef REQUIRED_ALSA_VERSION
30- ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION))
31-endif
32 sane-alsa-headers:
33 ifdef REQUIRED_ALSA_VERSION
34 @if [ "$(ALSA_CHECK)" != "missing" ] ; then \
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
index e85f692..f900362 100644
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -290,6 +290,7 @@ FILES_${JDKPN}-dbg = "\
290 ${JDK_HOME}/jre/lib/.debug \ 290 ${JDK_HOME}/jre/lib/.debug \
291 ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug \ 291 ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug \
292 ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug \ 292 ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug \
293 ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \
293 ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \ 294 ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \
294 ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \ 295 ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \
295 ${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/.debug \ 296 ${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/.debug \
diff --git a/recipes-core/openjdk/openjdk-6-release-6b27.inc b/recipes-core/openjdk/openjdk-6-release-6b27.inc
index 59b36d9..eddb4e4 100644
--- a/recipes-core/openjdk/openjdk-6-release-6b27.inc
+++ b/recipes-core/openjdk/openjdk-6-release-6b27.inc
@@ -22,6 +22,10 @@ SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd"
22SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c" 22SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c"
23 23
24 24
25ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no" 25ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no \
26 file://icedtea-disable-sane-alsa.patch;apply=no \
27 "
26 28
27DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch" 29DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch \
30 patches/icedtea-disable-sane-alsa.patch \
31 "
diff --git a/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb b/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb
deleted file mode 100644
index 9660a15..0000000
--- a/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require openjdk-6-release-6b27.inc
2
3PR = "${INC_PR}.2"
4
5SRC_URI[iced.md5sum] = "2299fde9f315c7feb561c2975aa232b1"
6SRC_URI[iced.sha256sum] = "c61d6eb2f98d5c4059bb6eb6d808dd0954cf7d35c14290e5c77c3d7db75d2b35"
diff --git a/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb b/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb
new file mode 100644
index 0000000..8d12a8e
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb
@@ -0,0 +1,6 @@
1require openjdk-6-release-6b27.inc
2
3PR = "${INC_PR}.4"
4
5SRC_URI[iced.md5sum] = "7712c4b3b9f8092aa8c7b5cad0b46d06"
6SRC_URI[iced.sha256sum] = "c2ad74af29af774f778675d3fde952f4defebb2be44f565253d788e2e7af39d4"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-27 01:26:39 +0000