diff options
Diffstat (limited to 'recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch')
-rw-r--r-- | recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch | 513 |
1 files changed, 513 insertions, 0 deletions
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch new file mode 100644 index 0000000..cd0f68a --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch | |||
@@ -0,0 +1,513 @@ | |||
1 | Index: openjdk/jdk/make/sun/awt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/sun/awt/Makefile 2009-04-24 09:33:55.000000000 +0200 | ||
4 | +++ openjdk/jdk/make/sun/awt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
5 | @@ -180,7 +180,8 @@ | ||
6 | include $(BUILDDIR)/common/Mapfile-vers.gmk | ||
7 | include $(BUILDDIR)/common/Library.gmk | ||
8 | |||
9 | -build: fontconfigs | ||
10 | +#build: fontconfigs | ||
11 | +build: | ||
12 | |||
13 | |||
14 | ifeq ($(PLATFORM), windows) | ||
15 | @@ -535,9 +536,9 @@ | ||
16 | -I$(PLATFORM_SRC)/native/$(PKGDIR) \ | ||
17 | $(EVENT_MODEL) | ||
18 | |||
19 | -ifeq ($(PLATFORM), linux) | ||
20 | -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
21 | -endif | ||
22 | +#ifeq ($(PLATFORM), linux) | ||
23 | +#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
24 | +#endif | ||
25 | |||
26 | LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ | ||
27 | $(AWT_RUNPATH) | ||
28 | Index: openjdk/jdk/make/javax/sound/jsoundalsa/Makefile | ||
29 | =================================================================== | ||
30 | --- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:48:34.534565581 +0200 | ||
31 | +++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
32 | @@ -44,34 +44,35 @@ | ||
33 | # Files | ||
34 | # | ||
35 | |||
36 | -FILES_c = \ | ||
37 | - Utilities.c \ | ||
38 | - $(DAUDIOFILES_c) \ | ||
39 | - $(MIDIFILES_c) \ | ||
40 | - $(PORTFILES_c) | ||
41 | +#FILES_c = \ | ||
42 | +# Utilities.c \ | ||
43 | +# $(DAUDIOFILES_c) \ | ||
44 | +# $(MIDIFILES_c) \ | ||
45 | +# $(PORTFILES_c) | ||
46 | |||
47 | # platform dependent files | ||
48 | -FILES_c += \ | ||
49 | - PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
50 | - PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
51 | - PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
52 | - PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
53 | - PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
54 | - PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
55 | - PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
56 | - | ||
57 | -FILES_export = \ | ||
58 | - $(DAUDIOFILES_export) \ | ||
59 | - $(MIDIFILES_export) \ | ||
60 | - $(PORTFILES_export) | ||
61 | +#FILES_c += \ | ||
62 | +# PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
63 | +# PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
64 | +# PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
65 | +# PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
66 | +# PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
67 | +# PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
68 | +# PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
69 | + | ||
70 | +FILES_export = | ||
71 | +#FILES_export = \ | ||
72 | +# $(DAUDIOFILES_export) \ | ||
73 | +# $(MIDIFILES_export) \ | ||
74 | +# $(PORTFILES_export) | ||
75 | |||
76 | -OTHER_LDLIBS += -lasound | ||
77 | +#OTHER_LDLIBS += -lasound | ||
78 | |||
79 | CPPFLAGS += \ | ||
80 | - -DUSE_DAUDIO=TRUE \ | ||
81 | - -DUSE_PORTS=TRUE \ | ||
82 | - -DUSE_PLATFORM_MIDI_OUT=TRUE \ | ||
83 | - -DUSE_PLATFORM_MIDI_IN=TRUE \ | ||
84 | + -DUSE_DAUDIO=FALSE \ | ||
85 | + -DUSE_PORTS=FALSE \ | ||
86 | + -DUSE_PLATFORM_MIDI_OUT=FALSE \ | ||
87 | + -DUSE_PLATFORM_MIDI_IN=FALSE \ | ||
88 | -I$(SHARE_SRC)/native/com/sun/media/sound | ||
89 | |||
90 | # | ||
91 | Index: openjdk/jdk/make/sun/splashscreen/Makefile | ||
92 | =================================================================== | ||
93 | --- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:48:33.738565601 +0200 | ||
94 | +++ openjdk/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
95 | @@ -32,7 +32,8 @@ | ||
96 | # | ||
97 | # Files | ||
98 | # | ||
99 | -include FILES_c.gmk | ||
100 | +#include FILES_c.gmk | ||
101 | +FILES_c = | ||
102 | |||
103 | FILES_java = \ | ||
104 | java/awt/SplashScreen.java | ||
105 | @@ -62,9 +63,9 @@ | ||
106 | CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE | ||
107 | |||
108 | ifneq ($(PLATFORM), windows) | ||
109 | - CFLAGS += -DWITH_X11 | ||
110 | - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
111 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
112 | +# CFLAGS += -DWITH_X11 | ||
113 | +# CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
114 | +# OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
115 | else # PLATFORM | ||
116 | CFLAGS += -DWITH_WIN32 | ||
117 | OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib | ||
118 | @@ -79,7 +80,7 @@ | ||
119 | vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg | ||
120 | vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen | ||
121 | |||
122 | -CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
123 | +#CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
124 | |||
125 | ifeq ($(PLATFORM), linux) | ||
126 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
127 | Index: openjdk/jdk/make/sun/xawt/Makefile | ||
128 | =================================================================== | ||
129 | --- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-04-24 09:33:56.000000000 +0200 | ||
130 | +++ openjdk/jdk/make/sun/xawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
131 | @@ -41,15 +41,16 @@ | ||
132 | # | ||
133 | # Files | ||
134 | # | ||
135 | -include FILES_c_unix.gmk | ||
136 | -include FILES_export_unix.gmk | ||
137 | +#include FILES_c_unix.gmk | ||
138 | +FILES_c = | ||
139 | +#include FILES_export_unix.gmk | ||
140 | AUTO_FILES_JAVA_DIRS = sun/awt/X11 | ||
141 | AUTO_JAVA_PRUNE = WrapperGenerator.java | ||
142 | |||
143 | LDFLAGS += -L$(OPENWIN_LIB) | ||
144 | |||
145 | ifeq ($(PLATFORM), linux) | ||
146 | -LDFLAGS += -lpthread | ||
147 | +#LDFLAGS += -lpthread | ||
148 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
149 | endif | ||
150 | |||
151 | @@ -86,16 +87,19 @@ | ||
152 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl | ||
153 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 | ||
154 | |||
155 | -OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
156 | - $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
157 | +#OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
158 | +# $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
159 | |||
160 | ifeq ($(PLATFORM), solaris) | ||
161 | CPPFLAGS += -DFUNCPROTO=15 | ||
162 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
163 | endif | ||
164 | |||
165 | -CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
166 | +#CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
167 | |||
168 | +# Normally we would like to patch these includes away but | ||
169 | +# we need them for the successfull compilation of the sizer | ||
170 | +# executables. | ||
171 | CPPFLAGS += -DXAWT -DXAWT_HACK \ | ||
172 | -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ | ||
173 | -I$(PLATFORM_SRC)/native/sun/awt \ | ||
174 | @@ -124,10 +128,10 @@ | ||
175 | |||
176 | ifeq ($(PLATFORM), linux) | ||
177 | # Allows for builds on Debian GNU Linux, X11 is in a different place | ||
178 | - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
179 | - -I/usr/include/X11/extensions \ | ||
180 | - -I$(MOTIF_DIR)/include \ | ||
181 | - -I$(OPENWIN_HOME)/include | ||
182 | +# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
183 | +# -I/usr/include/X11/extensions \ | ||
184 | +# -I$(MOTIF_DIR)/include \ | ||
185 | +# -I$(OPENWIN_HOME)/include | ||
186 | endif | ||
187 | |||
188 | ifeq ($(PLATFORM), solaris) | ||
189 | @@ -238,18 +242,20 @@ | ||
190 | $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) | ||
191 | |||
192 | $(SIZES): $(SIZERS) | ||
193 | - @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
194 | - $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
195 | - $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
196 | - $(CHMOD) +w $@;\ | ||
197 | - else \ | ||
198 | - $(ECHO) GENERATING $@; \ | ||
199 | - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
200 | - fi | ||
201 | - @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
202 | - $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
203 | - $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
204 | - fi | ||
205 | + touch $(SIZES) | ||
206 | +# | ||
207 | +# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
208 | +# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
209 | +# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
210 | +# $(CHMOD) +w $@;\ | ||
211 | +# else \ | ||
212 | +# $(ECHO) GENERATING $@; \ | ||
213 | +# $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
214 | +# fi | ||
215 | +# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
216 | +# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
217 | +# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
218 | +# fi | ||
219 | |||
220 | $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) | ||
221 | $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ | ||
222 | Index: openjdk/jdk/make/sun/jawt/Makefile | ||
223 | =================================================================== | ||
224 | --- openjdk.orig/jdk/make/sun/jawt/Makefile 2009-09-29 13:48:34.186565471 +0200 | ||
225 | +++ openjdk/jdk/make/sun/jawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
226 | @@ -36,7 +36,8 @@ | ||
227 | ifeq ($(PLATFORM), windows) | ||
228 | FILES_cpp = jawt.cpp | ||
229 | else # PLATFORM | ||
230 | -FILES_c = jawt.c | ||
231 | +FILES_c = | ||
232 | +#FILES_c = jawt.c | ||
233 | endif # PLATFORM | ||
234 | |||
235 | FILES_h = $(INCLUDEDIR)/jawt.h \ | ||
236 | Index: openjdk/jdk/make/sun/jpeg/Makefile | ||
237 | =================================================================== | ||
238 | --- openjdk.orig/jdk/make/sun/jpeg/Makefile 2009-09-29 13:48:33.726565626 +0200 | ||
239 | +++ openjdk/jdk/make/sun/jpeg/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
240 | @@ -37,7 +37,8 @@ | ||
241 | # | ||
242 | # Files | ||
243 | # | ||
244 | -include FILES_c.gmk | ||
245 | +FILES_c = | ||
246 | +#include FILES_c.gmk | ||
247 | |||
248 | AUTO_FILES_JAVA_DIRS = sun/awt/image com/sun/imageio/plugins/jpeg | ||
249 | |||
250 | Index: openjdk/jdk/make/common/shared/Defs-java.gmk | ||
251 | =================================================================== | ||
252 | --- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:48:55.954565215 +0200 | ||
253 | +++ openjdk/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:57:14.446815782 +0200 | ||
254 | @@ -36,14 +36,14 @@ | ||
255 | # Memory related -J flags that all uses of java tools should use. | ||
256 | # | ||
257 | JAVA_MEM_FLAGS = -Xmx$(MAX_VM_MEMORY)m | ||
258 | -ifneq (,$(filter $(ARCH), ia64 s390)) | ||
259 | +#ifneq (,$(filter $(ARCH), ia64 s390)) | ||
260 | # Special flags for javac on ia64 to work around a VM problem with | ||
261 | # bad code generation during inlining (what version had this problem?): | ||
262 | # Suspect this may not be needed anymore. | ||
263 | - JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
264 | -else | ||
265 | - JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
266 | -endif | ||
267 | +# JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
268 | +#else | ||
269 | +# JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
270 | +#endif | ||
271 | |||
272 | # | ||
273 | # All java tools (javac, javah, and javadoc) run faster with certain java | ||
274 | Index: openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java | ||
275 | =================================================================== | ||
276 | --- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-04-24 09:34:04.000000000 +0200 | ||
277 | +++ openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-09-29 13:57:14.450815511 +0200 | ||
278 | @@ -113,7 +113,7 @@ | ||
279 | * @since 1.4 | ||
280 | */ | ||
281 | public static boolean isHeadless() { | ||
282 | - return getHeadlessProperty(); | ||
283 | + return true; | ||
284 | } | ||
285 | |||
286 | /** | ||
287 | Index: openjdk/corba/make/common/Defs.gmk | ||
288 | =================================================================== | ||
289 | --- openjdk.orig/corba/make/common/Defs.gmk 2009-04-24 09:30:19.000000000 +0200 | ||
290 | +++ openjdk/corba/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
291 | @@ -444,11 +444,11 @@ | ||
292 | # Tool flags | ||
293 | # | ||
294 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
295 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
296 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
297 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
298 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
299 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
300 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
301 | $(DEFINES) $(OPTIONS:%=-D%) | ||
302 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
303 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
304 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
305 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
306 | $(OTHER_LINTFLAGS) | ||
307 | Index: openjdk/jdk/make/common/Defs.gmk | ||
308 | =================================================================== | ||
309 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:48:33.590565061 +0200 | ||
310 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
311 | @@ -662,11 +662,11 @@ | ||
312 | # Tool flags | ||
313 | # | ||
314 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
315 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
316 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
317 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
318 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
319 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
320 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
321 | $(DEFINES) $(OPTIONS:%=-D%) | ||
322 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
323 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
324 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
325 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
326 | $(OTHER_LINTFLAGS) | ||
327 | Index: openjdk/hotspot/make/linux/makefiles/vm.make | ||
328 | =================================================================== | ||
329 | --- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:48:34.098565716 +0200 | ||
330 | +++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:57:14.450815511 +0200 | ||
331 | @@ -170,6 +170,7 @@ | ||
332 | LIBS_VM += $(LLVM_LIBS) | ||
333 | endif | ||
334 | |||
335 | +LFLAGS_VM = $(OE_LDFLAGS) | ||
336 | LINK_VM = $(LINK_LIB.c) | ||
337 | |||
338 | # rule for building precompiled header | ||
339 | Index: openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c | ||
340 | =================================================================== | ||
341 | --- openjdk.orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-04-24 09:34:34.000000000 +0200 | ||
342 | +++ openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-09-29 13:57:14.450815511 +0200 | ||
343 | @@ -26,8 +26,10 @@ | ||
344 | #include <jni.h> | ||
345 | #include <jni_util.h> | ||
346 | #include <dlfcn.h> | ||
347 | +#if 0 | ||
348 | #include <cups/cups.h> | ||
349 | #include <cups/ppd.h> | ||
350 | +#endif | ||
351 | |||
352 | //#define CUPS_DEBUG | ||
353 | |||
354 | @@ -37,6 +39,7 @@ | ||
355 | #define DPRINTF(x, y) | ||
356 | #endif | ||
357 | |||
358 | +#if 0 | ||
359 | typedef const char* (*fn_cupsServer)(void); | ||
360 | typedef int (*fn_ippPort)(void); | ||
361 | typedef http_t* (*fn_httpConnect)(const char *, int); | ||
362 | @@ -56,7 +59,7 @@ | ||
363 | fn_ppdClose j2d_ppdClose; | ||
364 | fn_ppdFindOption j2d_ppdFindOption; | ||
365 | fn_ppdPageSize j2d_ppdPageSize; | ||
366 | - | ||
367 | +#endif | ||
368 | |||
369 | /* | ||
370 | * Initialize library functions. | ||
371 | @@ -65,6 +68,7 @@ | ||
372 | JNIEXPORT jboolean JNICALL | ||
373 | Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env, | ||
374 | jobject printObj) { | ||
375 | +#if 0 | ||
376 | void *handle = dlopen("libcups.so.2", RTLD_LAZY | RTLD_GLOBAL); | ||
377 | |||
378 | if (handle == NULL) { | ||
379 | @@ -131,6 +135,8 @@ | ||
380 | } | ||
381 | |||
382 | return JNI_TRUE; | ||
383 | +#endif | ||
384 | + return JNI_FALSE; | ||
385 | } | ||
386 | |||
387 | /* | ||
388 | @@ -141,6 +147,7 @@ | ||
389 | Java_sun_print_CUPSPrinter_getCupsServer(JNIEnv *env, | ||
390 | jobject printObj) | ||
391 | { | ||
392 | +#if 0 | ||
393 | jstring cServer = NULL; | ||
394 | const char* server = j2d_cupsServer(); | ||
395 | if (server != NULL) { | ||
396 | @@ -152,6 +159,8 @@ | ||
397 | } | ||
398 | } | ||
399 | return cServer; | ||
400 | +#endif | ||
401 | + return NULL; | ||
402 | } | ||
403 | |||
404 | /* | ||
405 | @@ -162,8 +171,11 @@ | ||
406 | Java_sun_print_CUPSPrinter_getCupsPort(JNIEnv *env, | ||
407 | jobject printObj) | ||
408 | { | ||
409 | +#if 0 | ||
410 | int port = j2d_ippPort(); | ||
411 | return (jint) port; | ||
412 | +#endif | ||
413 | + return 0; | ||
414 | } | ||
415 | |||
416 | |||
417 | @@ -177,6 +189,7 @@ | ||
418 | jstring server, | ||
419 | jint port) | ||
420 | { | ||
421 | +#if 0 | ||
422 | const char *serverName; | ||
423 | serverName = (*env)->GetStringUTFChars(env, server, NULL); | ||
424 | if (serverName != NULL) { | ||
425 | @@ -187,6 +200,7 @@ | ||
426 | return JNI_TRUE; | ||
427 | } | ||
428 | } | ||
429 | +#endif | ||
430 | return JNI_FALSE; | ||
431 | } | ||
432 | |||
433 | @@ -199,6 +213,7 @@ | ||
434 | jobject printObj, | ||
435 | jstring printer) | ||
436 | { | ||
437 | +#if 0 | ||
438 | ppd_file_t *ppd; | ||
439 | ppd_option_t *optionTray, *optionPage; | ||
440 | ppd_choice_t *choice; | ||
441 | @@ -304,6 +319,8 @@ | ||
442 | j2d_ppdClose(ppd); | ||
443 | unlink(filename); | ||
444 | return nameArray; | ||
445 | +#endif | ||
446 | + return NULL; | ||
447 | } | ||
448 | |||
449 | |||
450 | @@ -315,6 +332,7 @@ | ||
451 | jobject printObj, | ||
452 | jstring printer) | ||
453 | { | ||
454 | +#if 0 | ||
455 | ppd_file_t *ppd; | ||
456 | ppd_option_t *option; | ||
457 | ppd_choice_t *choice; | ||
458 | @@ -374,4 +392,6 @@ | ||
459 | j2d_ppdClose(ppd); | ||
460 | unlink(filename); | ||
461 | return sizeArray; | ||
462 | +#endif | ||
463 | + return NULL; | ||
464 | } | ||
465 | Index: openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java | ||
466 | =================================================================== | ||
467 | --- openjdk.orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-04-24 09:34:17.000000000 +0200 | ||
468 | +++ openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
469 | @@ -244,6 +244,8 @@ | ||
470 | * that might be specified. | ||
471 | */ | ||
472 | fontConfig = createFontConfiguration(); | ||
473 | + if (fontConfig == null) | ||
474 | + return null; | ||
475 | getPlatformFontPathFromFontConfig(); | ||
476 | |||
477 | String extraFontPath = fontConfig.getExtraFontPath(); | ||
478 | Index: openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java | ||
479 | =================================================================== | ||
480 | --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-04-24 09:34:33.000000000 +0200 | ||
481 | +++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
482 | @@ -899,7 +899,8 @@ | ||
483 | |||
484 | // Implements SunGraphicsEnvironment.createFontConfiguration. | ||
485 | protected FontConfiguration createFontConfiguration() { | ||
486 | - return new MFontConfiguration(this); | ||
487 | +// return new MFontConfiguration(this); | ||
488 | + return null; | ||
489 | } | ||
490 | public FontConfiguration | ||
491 | createFontConfiguration(boolean preferLocaleFonts, | ||
492 | Index: openjdk/jdk/make/launchers/Makefile | ||
493 | =================================================================== | ||
494 | --- openjdk.orig/jdk/make/launchers/Makefile 2009-09-29 13:48:33.490815135 +0200 | ||
495 | +++ openjdk/jdk/make/launchers/Makefile 2009-09-29 13:57:14.454815276 +0200 | ||
496 | @@ -57,7 +57,7 @@ | ||
497 | endif | ||
498 | # Run MAKE $@ for all generic launchers | ||
499 | define make-all-launchers | ||
500 | -$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
501 | +#$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
502 | $(call make-launcher, apt, com.sun.tools.apt.Main, , ) | ||
503 | $(call make-launcher, extcheck, com.sun.tools.extcheck.Main, , ) | ||
504 | $(call make-launcher, idlj, com.sun.tools.corba.se.idl.toJavaPortable.Compile, , ) | ||
505 | @@ -93,7 +93,7 @@ | ||
506 | -J-Dcom.sun.CORBA.activation.Port=1049 \ | ||
507 | -J-Dcom.sun.CORBA.POA.ORBServerId=1, ) | ||
508 | $(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack) | ||
509 | -$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
510 | +#$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
511 | $(call make-launcher, rmic, sun.rmi.rmic.Main, , ) | ||
512 | $(call make-launcher, rmid, sun.rmi.server.Activation, , ) | ||
513 | $(call make-launcher, rmiregistry, sun.rmi.registry.RegistryImpl, , ) | ||