diff options
| author | Kyle Russell <bkylerussell@gmail.com> | 2019-02-04 17:01:37 -0500 |
|---|---|---|
| committer | Richard Leitner <richard.leitner@skidata.com> | 2019-12-27 12:17:18 +0100 |
| commit | c34172c39e037e2c4dadc1b9e77522ffa158ba2c (patch) | |
| tree | 5f16afbe843275fa52b9ff55148d90eb4ca619ad | |
| parent | 541dfa20ec6cfca63ed48eecf8fc934268f7ca39 (diff) | |
| download | meta-java-c34172c39e037e2c4dadc1b9e77522ffa158ba2c.tar.gz meta-java-c34172c39e037e2c4dadc1b9e77522ffa158ba2c.tar.bz2 meta-java-c34172c39e037e2c4dadc1b9e77522ffa158ba2c.zip | |
icedtea7-native: set default x11 PACKAGECONFIG from DISTRO_FEATURES
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>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
| -rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index c7c3bd6..264ff28 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -12,7 +12,7 @@ DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ xorgproto-native libx11-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)}" |