diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-sato/webkit | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r-- | meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb index 3db8e6d713..29f8a7993f 100644 --- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb +++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | |||
@@ -15,7 +15,7 @@ ICU_LIB_powerpc = "pango" | |||
15 | 15 | ||
16 | DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ | 16 | DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ |
17 | gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" | 17 | gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" |
18 | DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" | 18 | DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" |
19 | 19 | ||
20 | SRC_URI = "\ | 20 | SRC_URI = "\ |
21 | http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \ | 21 | http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \ |
@@ -47,7 +47,7 @@ EXTRA_OECONF = "\ | |||
47 | --enable-link-prefetch \ | 47 | --enable-link-prefetch \ |
48 | --with-gtk=2.0 \ | 48 | --with-gtk=2.0 \ |
49 | --disable-geolocation \ | 49 | --disable-geolocation \ |
50 | ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ | 50 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ |
51 | UNICODE_CFLAGS=-D_REENTRANT \ | 51 | UNICODE_CFLAGS=-D_REENTRANT \ |
52 | " | 52 | " |
53 | 53 | ||