From: Ross Burton Date: Fri, 18 Dec 2015 16:56:18 +0000 (+0000) Subject: conf/local.conf.sample: comment out ASSUME_PROVIDED=libsdl-native X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=759accbfca46de058ce402938713189dab22a70c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git conf/local.conf.sample: comment out ASSUME_PROVIDED=libsdl-native Ubuntu 15.10 and Debian testing can't build qemu-native against the host libsdl. Now that libsdl-native is buildable, comment out the ASSUME_PROVIDED which meant it wouldn't be used. [ YOCTO #8553 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample index 371349d3f29..7a0dde5a8cf 100644 --- a/meta-yocto/conf/local.conf.sample +++ b/meta-yocto/conf/local.conf.sample @@ -223,11 +223,12 @@ BB_DISKMON_DIRS = "\ # Qemu configuration # # By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. This assumes there is a -# libsdl library available on your build system. +# seen. The two lines below enable the SDL backend too. By default libsdl-native will +# be built, if you want to use your host's libSDL instead of the minimal libsdl built +# by libsdl-native then uncomment the ASSUME_PROVIDED line below. PACKAGECONFIG_append_pn-qemu-native = " sdl" PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -ASSUME_PROVIDED += "libsdl-native" +#ASSUME_PROVIDED += "libsdl-native" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to