diff options
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.patch | 42 |
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 @@ | |||
1 | icedtea7-native compile failure undefined reference to `main' | ||
2 | |||
3 | On hosts without /usr/include/X11/extensions, icedtea7-native compile | ||
4 | results 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 | |||
9 | The compile line shows: (-c gets eaten) | ||
10 | ... -I -c -o | ||
11 | |||
12 | The makefile tries to do the following which results in a faulty build | ||
13 | line 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 | |||
18 | This looks like a missed line from the following patch which removes the need for X11/extensions: | ||
19 | icedtea-ecj-disable-compilation.patch | ||
20 | |||
21 | Upstream-Status: Pending | ||
22 | |||
23 | Signed-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 | ||