diff options
-rw-r--r-- | meta/recipes-graphics/directfb/directfb.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/pango/pango_1.38.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.10.7.bb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index f6b7cbe1ad..46748988ea 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc | |||
@@ -26,7 +26,7 @@ S = "${WORKDIR}/DirectFB-${PV}" | |||
26 | LDFLAGS_append =" -lts -lm" | 26 | LDFLAGS_append =" -lts -lm" |
27 | 27 | ||
28 | # Workaround for linking issues seen with armv7a + gold | 28 | # Workaround for linking issues seen with armv7a + gold |
29 | LDFLAGS_append_arm = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 29 | LDFLAGS_append_arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
30 | 30 | ||
31 | BINCONFIG = "${bindir}/directfb-config" | 31 | BINCONFIG = "${bindir}/directfb-config" |
32 | 32 | ||
diff --git a/meta/recipes-graphics/pango/pango_1.38.1.bb b/meta/recipes-graphics/pango/pango_1.38.1.bb index 7fc65fd439..756dac4d13 100644 --- a/meta/recipes-graphics/pango/pango_1.38.1.bb +++ b/meta/recipes-graphics/pango/pango_1.38.1.bb | |||
@@ -36,7 +36,7 @@ LIBV = "1.8.0" | |||
36 | 36 | ||
37 | # This binary needs to be compiled for the host architecture. This isn't pretty! | 37 | # This binary needs to be compiled for the host architecture. This isn't pretty! |
38 | do_compile_prepend_class-target () { | 38 | do_compile_prepend_class-target () { |
39 | if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then | 39 | if ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then |
40 | make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode | 40 | make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode |
41 | fi | 41 | fi |
42 | } | 42 | } |
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb index 8eb6b9f3b2..d4f1d3b8aa 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb | |||
@@ -34,8 +34,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ | |||
34 | ruby-native libnotify gstreamer1.0-plugins-bad \ | 34 | ruby-native libnotify gstreamer1.0-plugins-bad \ |
35 | " | 35 | " |
36 | 36 | ||
37 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ | 37 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ |
38 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \ | 38 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \ |
39 | enchant \ | 39 | enchant \ |
40 | gtk2 \ | 40 | gtk2 \ |
41 | libsecret \ | 41 | libsecret \ |