diff options
author | Maxin B. John <maxin.john@intel.com> | 2016-06-20 14:36:07 +0300 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2016-06-20 14:38:48 +0300 |
commit | 1d820a778c0aa5d1d8bbff9949e77c32a08c8a7b (patch) | |
tree | d5b13a07608fcda0ce3c4d4a7f15c83cbb070c8b /recipes-core/icedtea | |
parent | 74811bbadaf55fd105ad092a1fcb4923afd4d41d (diff) | |
download | meta-java-1d820a778c0aa5d1d8bbff9949e77c32a08c8a7b.tar.gz |
replace base_contains by bb.utils.contains
Replace all instances of base_contains with bb.utils.contains to avoid
warnings.
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/icedtea')
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 6 | ||||
-rw-r--r-- | recipes-core/icedtea/openjdk-7-release-03b147.inc | 2 |
2 files changed, 4 insertions, 4 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 \ | |||
14 | PACKAGECONFIG ??= "" | 14 | PACKAGECONFIG ??= "" |
15 | PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xproto-native libxt-native libxext-native libxrender-native" | 15 | PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xproto-native libxt-native libxext-native libxrender-native" |
16 | 16 | ||
17 | OEMAKE_BUILD_HEADLESS_ONLY = "${@base_contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" | 17 | OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" |
18 | CFLAGS_append = "${@base_contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" | 18 | CFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" |
19 | 19 | ||
20 | inherit native java autotools pkgconfig | 20 | inherit native java autotools pkgconfig |
21 | 21 | ||
@@ -136,7 +136,7 @@ do_configure_prepend() { | |||
136 | done | 136 | done |
137 | } | 137 | } |
138 | 138 | ||
139 | POST_CONFIGURE_CLEAN_X11 = "${@base_contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" | 139 | POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" |
140 | 140 | ||
141 | do_configure_append() { | 141 | do_configure_append() { |
142 | oe_runmake patch-fsg | 142 | 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 = " \ | |||
96 | patches/icedtea-disable-sun.applet-for-tools-in-headless.patch \ | 96 | patches/icedtea-disable-sun.applet-for-tools-in-headless.patch \ |
97 | " | 97 | " |
98 | 98 | ||
99 | CLEAN_X11_DISTRIBUTION_PATCH = "${@base_contains('PACKAGECONFIG', 'x11', '', '${OPENJDK_HEADLESS_PATCHES}', d)}" | 99 | CLEAN_X11_DISTRIBUTION_PATCH = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', '${OPENJDK_HEADLESS_PATCHES}', d)}" |
100 | 100 | ||
101 | export DISTRIBUTION_PATCHES = " \ | 101 | export DISTRIBUTION_PATCHES = " \ |
102 | patches/icedtea-ecj-disable-compilation.patch \ | 102 | patches/icedtea-ecj-disable-compilation.patch \ |