>From 4789a5dc622cc8537df28596a4beb66db4ba4774 Mon Sep 17 00:00:00 2001
From: Amy Fong
Date: Tue, 14 Apr 2015 13:10:22 -0400
Subject: [PATCH] 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
---
recipes-core/icedtea/icedtea7-native.inc | 2 ++
.../openjdk-7-03b147/headless_x11_cleanup.patch| 35 ++
2 files changed, 37 insertions(+)
create mode 100644
recipes-core/icedtea/openjdk-7-03b147/headless_x11_cleanup.patch
diff --git a/recipes-core/icedtea/icedtea7-native.inc
b/recipes-core/icedtea/icedtea7-native.inc
index 81e9b66..f555d70 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -30,6 +30,7 @@ SRC_URI = " \
SRC_URI += "file://icedtea-unzip.patch"
SRC_URI += "file://icedtea-unzip-phase2.patch;apply=no"
+SRC_URI += "file://headless_x11_cleanup.patch;apply=no"
S = "${WORKDIR}/${ICEDTEA}"
B = "${S}/build"
@@ -149,6 +150,7 @@ do_configure_append() {
oe_runmake patch-boot
cd ${S} && cat ${WORKDIR}/icedtea-unzip-phase2.patch | patch -p1
+ cd ${S} && cat ${WORKDIR}/headless_x11_cleanup.patch | patch -p1
}
EXTRA_OEMAKE = ' \
diff --git a/recipes-core/icedtea/openjdk-7-03b147/headless_x11_cleanup.patch
b/recipes-core/icedtea/openjdk-7-03b147/headless_x11_cleanup.patch
new file mode 100644
index 000..5b3e650
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/headless_x11_cleanup.patch
@@ -0,0 +1,35 @@
+---
+ build/openjdk-boot/jdk/make/sun/awt/mawt.gmk |6 --
+ build/openjdk/jdk/make/sun/awt/mawt.gmk |6 --
+ 2 files changed, 12 deletions(-)
+
+--- a/build/openjdk-boot/jdk/make/sun/awt/mawt.gmk
b/build/openjdk-boot/jdk/make/sun/awt/mawt.gmk
+@@ -258,12 +258,6 @@
+ -I$(PLATFORM_SRC)/native/$(PKGDIR) \
+ $(EVENT_MODEL)
+
+-ifeq ($(PLATFORM), linux)
+- # Checking for the X11/extensions headers at the additional location
+- CPPFLAGS += -I$(firstword $(wildcard
$(OPENWIN_HOME)/include/X11/extensions) \
+-$(wildcard /usr/include/X11/extensions))
+-endif
+-
+ ifeq ($(PLATFORM), solaris)
+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
+ endif
+--- a/build/openjdk/jdk/make/sun/awt/mawt.gmk
b/build/openjdk/jdk/make/sun/awt/mawt.gmk
+@@ -258,12 +258,6 @@
+ -I$(PLATFORM_SRC)/native/$(PKGDIR) \
+ $(EVENT_MODEL)
+
+-ifeq ($(PLATFORM), linux)
+- # Checking for the X11/extensions headers at the additional location
+- CPPFLAGS += -I$(firstword $(wildcard
$(OPENWIN_HOME)/include/X11/extensions) \
+-$(wildcard /usr/include/X11/extensions))
+-endif
+-
+ ifeq ($(PLATFORM), solaris)
+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
+ endif
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
