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>

1 files changed, 10 insertions, 0 deletions

diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc
index 01e7a3d..98266f7 100644
--- a/recipes-core/icedtea/openjdk-7-release-03b147.inc
+++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc
@@ -82,8 +82,17 @@ OPENJDK_PATCHES = " \
         file://icedtea-flags.patch;apply=no \
         file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no \
         file://icedtea-change-to-gdb-debug-format.patch;apply=no \
+        file://icedtea-disable-x11-in-headless.patch;apply=no \
+        file://icedtea-disable-sun.applet-for-tools-in-headless.patch;apply=no \
         "
 
+OPENJDK_HEADLESS_PATCHES = " \
+        patches/icedtea-disable-x11-in-headless.patch \
+        patches/icedtea-disable-sun.applet-for-tools-in-headless.patch \
+        "
+
+CLEAN_X11_DISTRIBUTION_PATCH = "${@base_contains('PACKAGECONFIG', 'x11', '', '${OPENJDK_HEADLESS_PATCHES}', d)}"
+
 export DISTRIBUTION_PATCHES = " \
         patches/icedtea-ecj-disable-compilation.patch \
         patches/icedtea-unbreak-float.patch \
@@ -93,4 +102,5 @@ export DISTRIBUTION_PATCHES = " \
         patches/icedtea-flags.patch \
         patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \
         patches/icedtea-change-to-gdb-debug-format.patch \
+        ${CLEAN_X11_DISTRIBUTION_PATCH} \
         "