diff options
author | Jens Rehsack <rehsack@gmail.com> | 2015-10-15 13:52:09 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-10-15 10:32:00 -0300 |
commit | b331dec1d8c18e48b39b3c9e5d0c547e066f1d15 (patch) | |
tree | fb78859b95ccb0bbdcbc708b64e6736e39519d7e /recipes-core/icedtea/icedtea7-native.inc | |
parent | 1bbcc6313150358e5e527bd70e91632a0d420f3c (diff) | |
download | meta-java-b331dec1d8c18e48b39b3c9e5d0c547e066f1d15.tar.gz |
icedtea7-native: compiling without x11
Allow building icedtea7 without any X11 dependency.
This affects the native part only which is required to bootstrap openjdk-8-native
for cross-compiling openjdk-8, but should be adoptable for cross-compiled recipe
as well as for openjdk-6.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/icedtea/icedtea7-native.inc')
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index b29fd34..69dd0ae 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc | |||
@@ -5,13 +5,18 @@ INC_PR = "r1" | |||
5 | 5 | ||
6 | DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ | 6 | DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ |
7 | rhino-native ant-native libxslt-native attr-native \ | 7 | rhino-native ant-native libxslt-native attr-native \ |
8 | libx11-native xproto-native libxt-native libxext-native libxrender-native \ | ||
9 | giflib-native jpeg-native libpng-native \ | 8 | giflib-native jpeg-native libpng-native \ |
10 | glib-2.0-native freetype-native zlib-native \ | 9 | glib-2.0-native freetype-native zlib-native \ |
11 | fontconfig-native zip-native alsa-lib-native \ | 10 | fontconfig-native zip-native \ |
12 | unzip-native \ | 11 | unzip-native \ |
13 | " | 12 | " |
14 | 13 | ||
14 | PACKAGECONFIG ??= "" | ||
15 | PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xproto-native libxt-native libxext-native libxrender-native" | ||
16 | |||
17 | OEMAKE_BUILD_HEADLESS_ONLY = "${@base_contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" | ||
18 | CFLAGS_append = "${@base_contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" | ||
19 | |||
15 | inherit native java autotools | 20 | inherit native java autotools |
16 | 21 | ||
17 | JAVA_HOME[unexport] = "1" | 22 | JAVA_HOME[unexport] = "1" |
@@ -27,6 +32,7 @@ SRC_URI = " \ | |||
27 | ${LANGTOOLS_URI} \ | 32 | ${LANGTOOLS_URI} \ |
28 | ${ICEDTEA_PATCHES} \ | 33 | ${ICEDTEA_PATCHES} \ |
29 | ${OPENJDK_PATCHES} \ | 34 | ${OPENJDK_PATCHES} \ |
35 | file://allow-headless-build.patch;striplevel=0 \ | ||
30 | " | 36 | " |
31 | 37 | ||
32 | S = "${WORKDIR}/${ICEDTEA}" | 38 | S = "${WORKDIR}/${ICEDTEA}" |
@@ -124,6 +130,8 @@ do_configure_prepend() { | |||
124 | done | 130 | done |
125 | } | 131 | } |
126 | 132 | ||
133 | POST_CONFIGURE_CLEAN_X11 = "${@base_contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" | ||
134 | |||
127 | do_configure_append() { | 135 | do_configure_append() { |
128 | oe_runmake patch-fsg | 136 | oe_runmake patch-fsg |
129 | 137 | ||
@@ -143,6 +151,7 @@ do_configure_append() { | |||
143 | -e"s|g++\$(GCC_SUFFIX)|${CXX}|" \ | 151 | -e"s|g++\$(GCC_SUFFIX)|${CXX}|" \ |
144 | $F | 152 | $F |
145 | done | 153 | done |
154 | ${POST_CONFIGURE_CLEAN_X11} | ||
146 | oe_runmake patch-boot | 155 | oe_runmake patch-boot |
147 | } | 156 | } |
148 | 157 | ||
@@ -152,6 +161,7 @@ EXTRA_OEMAKE = ' \ | |||
152 | OE_CXXFLAGS="${CXXFLAGS}" \ | 161 | OE_CXXFLAGS="${CXXFLAGS}" \ |
153 | OE_LDFLAGS="${LDFLAGS}" \ | 162 | OE_LDFLAGS="${LDFLAGS}" \ |
154 | ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \ | 163 | ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \ |
164 | ${OEMAKE_BUILD_HEADLESS_ONLY} \ | ||
155 | ' | 165 | ' |
156 | 166 | ||
157 | do_compile() { | 167 | do_compile() { |