Forráskód Böngészése

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>
Ross Burton 8 éve
szülő
commit
0af3db7971
1 módosított fájl, 4 hozzáadás és 3 törlés
  1. 4 3
      meta/conf/local.conf.sample

+ 4 - 3
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