[meta-java] icedtea7-native: set default x11 PACKAGECONFIG from DISTRO_FEATURES

Submitted by Kyle Russell on Feb. 4, 2019, 10:01 p.m. | Patch ID: 158503

Details

Message ID 20190204220137.26744-1-bkylerussell@gmail.com
State Under Review
Delegated to: Richard Leitner
Headers show

Commit Message

Kyle Russell Feb. 4, 2019, 10:01 p.m.
If x11 is specified in DISTRO_FEATURES, then make it a default
PACKAGECONFIG option when building icedtea7-native; otherwise, the
libx11-native dependency won't be satisfied.

The recipe reads as though icedtea7-native can build completely without
X11, but if the libx11-native headers are not installed on the host
system, compile errors in multiple units because of a missing X11/Xlib.h.

In file included from ../../../src/share/native/sun/awt/../java2d/pipe/Region.h:34:0,
                 from ../../../src/share/native/sun/awt/../java2d/loops/GraphicsPrimitiveMgr.c:31:
../../../src/solaris/native/sun/awt/utility/rect.h:31:22: fatal error: X11/Xlib.h: No such file or directory

In this example, it appears that GraphicsPrimitiveMgr.c is supposed to
be compiled even in headless mode, so the dependency still seems to be
needed.

Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
---
 recipes-core/icedtea/icedtea7-native.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index 69f5d25..62dea78 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -11,7 +11,7 @@  DEPENDS = "virtual/javac-native virtual/java-native classpath-native \
 	   unzip-native make-native util-linux-native\
           "
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native"
 
 OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}"