aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-12-18 16:56:18 +0000
committerJoshua Lock <joshua.g.lock@intel.com>2016-05-06 15:51:14 +0100
commit0af3db797131c1745b9268ad09e5b89f401c10ba (patch)
tree727fb5339adbc59cb1d6027424b2071172bb003d
parent16b2e5a5af9fadbfe85a9f66be2896d1c7c3b72d (diff)
downloadopenembedded-core-0af3db797131c1745b9268ad09e5b89f401c10ba.tar.gz
openembedded-core-0af3db797131c1745b9268ad09e5b89f401c10ba.tar.bz2
openembedded-core-0af3db797131c1745b9268ad09e5b89f401c10ba.zip
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 <ross.burton@intel.com> (From OE-Core master rev: 81f009d173f24501ab0e04d845db74ecb5f8e332) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-rw-r--r--meta/conf/local.conf.sample7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 20ccf4cd23..ee5cd150d3 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -197,11 +197,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