diff options
Diffstat (limited to 'recipes-core')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 13 |
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 = "\ | |||
15 | libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \ | 15 | libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \ |
16 | " | 16 | " |
17 | 17 | ||
18 | PACKAGECONFIG ??= "repack" | 18 | PACKAGECONFIG ??= " \ |
19 | PACKAGECONFIG[x11] = "--with-x,,libx11 xproto libxt libxext libxrender" | 19 | repack \ |
20 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 cups', '', d)} \ | ||
21 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ | ||
22 | " | ||
23 | PACKAGECONFIG[x11] = "--with-x,,libx11 xproto libxt libxext libxrender libxtst" | ||
20 | PACKAGECONFIG[cups] = "--with-cups,,cups" | 24 | PACKAGECONFIG[cups] = "--with-cups,,cups" |
21 | PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib" | 25 | PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib" |
22 | 26 | ||
@@ -31,6 +35,11 @@ PACKAGECONFIG[shark] = "--with-jvm-variants=zeroshark,,llvm3.5," | |||
31 | 35 | ||
32 | PACKAGECONFIG[repack] = ",,," | 36 | PACKAGECONFIG[repack] = ",,," |
33 | 37 | ||
38 | CACHED_CONFIGUREVARS = " \ | ||
39 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_includes=${STAGING_INCDIR}', '', d)} \ | ||
40 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_libraries=${STAGING_LIBDIR}', '', d)} \ | ||
41 | " | ||
42 | |||
34 | require openjdk-8-common.inc | 43 | require openjdk-8-common.inc |
35 | 44 | ||
36 | JAVA_HOME[unexport] = "1" | 45 | JAVA_HOME[unexport] = "1" |