]> code.ossystems Code Review - openembedded-core.git/commitdiff
conf/local.conf.sample: comment out ASSUME_PROVIDED=libsdl-native
authorRoss Burton <ross.burton@intel.com>
Fri, 18 Dec 2015 16:56:18 +0000 (16:56 +0000)
committerJoshua Lock <joshua.g.lock@intel.com>
Thu, 3 Mar 2016 11:04:48 +0000 (11:04 +0000)
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 <ross.burton@intel.com>
(From OE-Core master rev: 81f009d173f24501ab0e04d845db74ecb5f8e332)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
meta/conf/local.conf.sample

index 9d1480e42ea87a22c91683bba02cc482a06d31c2..8652f1b2947005d6050ac04534a4ec7c827babb6 100644 (file)
@@ -203,11 +203,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