aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <peter.x.liu@external.atlascopco.com>2017-04-23 08:54:54 +0200
committerMaxin B. John <maxin.john@intel.com>2017-05-29 13:52:05 +0300
commitbc4857da8748f1a3d5ac323ea5f2e5132aef9754 (patch)
tree298135a76fa91ee065eb26679b3a07bf2c74ff03
parent87f62f5264c19e9979ffda06a300cf473ec06b52 (diff)
downloadmeta-java-bc4857da8748f1a3d5ac323ea5f2e5132aef9754.tar.gz
meta-java-bc4857da8748f1a3d5ac323ea5f2e5132aef9754.tar.bz2
meta-java-bc4857da8748f1a3d5ac323ea5f2e5132aef9754.zip
openjdk-8-cross.inc: tweak PACKAGECONFIG default value
When x11, alsa is being set in DISTRO_FEATURES, the users might expect openjdk build with the related options as well. For instance, they might be confused when the openjdk is still built as headless but x11 is actually enabled from system aspect. With this patch, the end users still can choose build openjdk without these options by overriding PACKAGECONFIG. Two small fixes are also needed to let openjdk build with x11: - Add libxtst to DEPENDS. - Pass ac_x_includes and ac_x_libraries to configure command. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
-rw-r--r--recipes-core/openjdk/openjdk-8-cross.inc13
1 files changed, 11 insertions, 2 deletions
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc
index 11e98b5..3973fcf 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -15,8 +15,12 @@ PRIVATE_LIBS = "\
libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \
"
-PACKAGECONFIG ??= "repack"
-PACKAGECONFIG[x11] = "--with-x,,libx11 xproto libxt libxext libxrender"
+PACKAGECONFIG ??= " \
+ repack \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 cups', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
+"
+PACKAGECONFIG[x11] = "--with-x,,libx11 xproto libxt libxext libxrender libxtst"
PACKAGECONFIG[cups] = "--with-cups,,cups"
PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib"
@@ -31,6 +35,11 @@ PACKAGECONFIG[shark] = "--with-jvm-variants=zeroshark,,llvm3.5,"
PACKAGECONFIG[repack] = ",,,"
+CACHED_CONFIGUREVARS = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_includes=${STAGING_INCDIR}', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_libraries=${STAGING_LIBDIR}', '', d)} \
+"
+
require openjdk-8-common.inc
JAVA_HOME[unexport] = "1"