summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch42
-rw-r--r--recipes-core/icedtea/openjdk-7-release-03b147.inc2
2 files changed, 44 insertions, 0 deletions
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch
new file mode 100644
index 0000000..1b92c9a
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch
@@ -0,0 +1,42 @@
1icedtea7-native compile failure undefined reference to `main'
2
3On hosts without /usr/include/X11/extensions, icedtea7-native compile
4results in a build failure while trying to create an object file:
5
6+/data/home/.../git/csu/../sysdeps/x86_64/start.S:118: undefined reference to `main'
7[2015-03-31 15:22:53.115930161+00:00] | collect2: error: ld returned 1 exit status
8
9The compile line shows: (-c gets eaten)
10... -I -c -o
11
12The makefile tries to do the following which results in a faulty build
13line if /usr/include/X11/extensions doesn't exist:
14
15 CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
16 $(wildcard /usr/include/X11/extensions))
17
18This looks like a missed line from the following patch which removes the need for X11/extensions:
19 icedtea-ecj-disable-compilation.patch
20
21Upstream-Status: Pending
22
23Signed-off-by: Amy Fong <amy.fong@windriver.com>
24---
25 openjdk/jdk/make/sun/awt/mawt.gmk | 6 ------
26 1 file changed, 6 deletions(-)
27
28--- openjdk/jdk/make/sun/awt/mawt.gmk
29+++ openjdk/jdk/make/sun/awt/mawt.gmk
30@@ -258,12 +258,6 @@
31 -I$(PLATFORM_SRC)/native/$(PKGDIR) \
32 $(EVENT_MODEL)
33
34-ifeq ($(PLATFORM), linux)
35- # Checking for the X11/extensions headers at the additional location
36- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
37- $(wildcard /usr/include/X11/extensions))
38-endif
39-
40 ifeq ($(PLATFORM), solaris)
41 CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
42 endif
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc
index b1cf6e9..dbdc045 100644
--- a/recipes-core/icedtea/openjdk-7-release-03b147.inc
+++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc
@@ -85,6 +85,7 @@ OPENJDK_PATCHES = " \
85 file://icedtea-disable-x11-in-headless.patch;apply=no \ 85 file://icedtea-disable-x11-in-headless.patch;apply=no \
86 file://icedtea-disable-sun.applet-for-tools-in-headless.patch;apply=no \ 86 file://icedtea-disable-sun.applet-for-tools-in-headless.patch;apply=no \
87 file://icedtea-hotspot-fix-undefined-behaviour.patch;apply=no \ 87 file://icedtea-hotspot-fix-undefined-behaviour.patch;apply=no \
88 file://icedtea-x11_extension_cleanup.patch;apply=no \
88 " 89 "
89 90
90OPENJDK_HEADLESS_PATCHES = " \ 91OPENJDK_HEADLESS_PATCHES = " \
@@ -104,5 +105,6 @@ export DISTRIBUTION_PATCHES = " \
104 patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \ 105 patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \
105 patches/icedtea-change-to-gdb-debug-format.patch \ 106 patches/icedtea-change-to-gdb-debug-format.patch \
106 patches/icedtea-hotspot-fix-undefined-behaviour.patch \ 107 patches/icedtea-hotspot-fix-undefined-behaviour.patch \
108 patches/icedtea-x11_extension_cleanup.patch \
107 ${CLEAN_X11_DISTRIBUTION_PATCH} \ 109 ${CLEAN_X11_DISTRIBUTION_PATCH} \
108 " 110 "