directfb/pango/webkit: base_contains -> bb.utils.contains
(From OE-Core rev: 7e971e079cb52e9de8d95b6e4126698a1402988f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
cb613904fd
commit
a13343b094
|
@ -26,7 +26,7 @@ S = "${WORKDIR}/DirectFB-${PV}"
|
|||
LDFLAGS_append =" -lts -lm"
|
||||
|
||||
# Workaround for linking issues seen with armv7a + gold
|
||||
LDFLAGS_append_arm = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
|
||||
LDFLAGS_append_arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
|
||||
|
||||
BINCONFIG = "${bindir}/directfb-config"
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ LIBV = "1.8.0"
|
|||
|
||||
# This binary needs to be compiled for the host architecture. This isn't pretty!
|
||||
do_compile_prepend_class-target () {
|
||||
if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then
|
||||
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
|
||||
fi
|
||||
}
|
||||
|
|
|
@ -34,8 +34,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
|
|||
ruby-native libnotify gstreamer1.0-plugins-bad \
|
||||
"
|
||||
|
||||
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
|
||||
${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \
|
||||
enchant \
|
||||
gtk2 \
|
||||
libsecret \
|
||||
|
|
Loading…
Reference in New Issue