summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch')
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch280
1 files changed, 280 insertions, 0 deletions
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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-08 10:52:10 +0000