summaryrefslogtreecommitdiffstats
path: root/recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2015-04-16 14:04:02 -0400
committerOtavio Salvador <otavio@ossystems.com.br>2016-01-04 09:21:06 -0200
commite3ac9836ab585c0b4134c7c0857cc275c403ad32 (patch)
tree9ed488b8d1a2ecba85a9d4400f5519e5890eb39e /recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch
parent278c9b5530a22bb3646cbe5883b9ae857da70dff (diff)
downloadmeta-java-e3ac9836ab585c0b4134c7c0857cc275c403ad32.tar.gz
icedtea7-native compile failure undefined reference to `main'
On hosts without /usr/include/X11/extensions, icedtea7-native compile results in a build failure while trying to create an object file: +/data/home/.../git/csu/../sysdeps/x86_64/start.S:118: undefined reference to `main' [2015-03-31 15:22:53.115930161+00:00] | collect2: error: ld returned 1 exit status The compile line shows: (-c gets eaten) ... -I -c -o The makefile tries to do the following which results in a faulty build line if /usr/include/X11/extensions doesn't exist: CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \ $(wildcard /usr/include/X11/extensions)) This looks like a missed line from the following patch which removes the need for X11/extensions: icedtea-ecj-disable-compilation.patch Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Diffstat (limited to 'recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch')
-rw-r--r--recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch42
1 files changed, 42 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