diff options
| -rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 6 | ||||
| -rw-r--r-- | recipes-core/icedtea/openjdk-7-release-03b147.inc | 2 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index 2dad84d..d624b7a 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -14,8 +14,8 @@ DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ PACKAGECONFIG ??= "" PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xproto-native libxt-native libxext-native libxrender-native" -OEMAKE_BUILD_HEADLESS_ONLY = "${@base_contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" -CFLAGS_append = "${@base_contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" +OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" +CFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" inherit native java autotools pkgconfig @@ -136,7 +136,7 @@ do_configure_prepend() { done } -POST_CONFIGURE_CLEAN_X11 = "${@base_contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" +POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" do_configure_append() { oe_runmake patch-fsg diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc index fdf3a89..0685729 100644 --- a/recipes-core/icedtea/openjdk-7-release-03b147.inc +++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc @@ -96,7 +96,7 @@ OPENJDK_HEADLESS_PATCHES = " \ patches/icedtea-disable-sun.applet-for-tools-in-headless.patch \ " -CLEAN_X11_DISTRIBUTION_PATCH = "${@base_contains('PACKAGECONFIG', 'x11', '', '${OPENJDK_HEADLESS_PATCHES}', d)}" +CLEAN_X11_DISTRIBUTION_PATCH = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', '${OPENJDK_HEADLESS_PATCHES}', d)}" export DISTRIBUTION_PATCHES = " \ patches/icedtea-ecj-disable-compilation.patch \ diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index ad35488..3206ec4 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc @@ -150,7 +150,7 @@ def jdk_configure_options(d): do_unpack[postfuncs] += "do_unpack_extract_submodules" -POST_CONFIGURE_CLEAN_X11 = "${@base_contains('PACKAGECONFIG', 'x11', '', 'rm -f jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" +POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm -f jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" do_patch_openjdk8() { olddir=`pwd` |