mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 03:49:32 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
08a38a7865
commit
4c14b09498
@@ -2,7 +2,7 @@ SUMMARY = "Fast open source processor emulator"
|
||||
HOMEPAGE = "http://qemu.org"
|
||||
LICENSE = "GPLv2 & LGPLv2.1"
|
||||
DEPENDS = "glib-2.0 zlib alsa-lib pixman dtc libsdl \
|
||||
${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
|
||||
DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native"
|
||||
DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
|
||||
RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"
|
||||
@@ -38,7 +38,7 @@ do_configure_prepend_class-native() {
|
||||
}
|
||||
|
||||
do_configure_prepend_class-nativesdk() {
|
||||
if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then
|
||||
if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then
|
||||
# Undo the -lX11 added by linker-flags.patch
|
||||
sed -i 's/-lX11//g' Makefile.target
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user