diff options
author | Ross Burton <ross.burton@intel.com> | 2015-12-18 16:56:18 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-12 10:59:11 +0100 |
commit | 740a2d817a217d63a7112a39b2b5df0129b7e783 (patch) | |
tree | a7b70136d9281c7b81e32a6d29ee0d9e8a472f0b | |
parent | 5aed3ebfc109dbe1d4fde380aa2394df6cdbfc79 (diff) | |
download | poky-740a2d817a217d63a7112a39b2b5df0129b7e783.tar.gz |
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 ]
(From meta-yocto master rev: 759accbfca46de058ce402938713189dab22a70c)
(From meta-yocto rev: aa4ad74c23b283f545a0f9f1ee57635fbe1a1dc6)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-yocto/conf/local.conf.sample | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample index a1d99f913e..49e59c274b 100644 --- a/meta-yocto/conf/local.conf.sample +++ b/meta-yocto/conf/local.conf.sample | |||
@@ -219,11 +219,12 @@ BB_DISKMON_DIRS = "\ | |||
219 | # Qemu configuration | 219 | # Qemu configuration |
220 | # | 220 | # |
221 | # By default qemu will build with a builtin VNC server where graphical output can be | 221 | # By default qemu will build with a builtin VNC server where graphical output can be |
222 | # seen. The two lines below enable the SDL backend too. This assumes there is a | 222 | # seen. The two lines below enable the SDL backend too. By default libsdl-native will |
223 | # libsdl library available on your build system. | 223 | # be built, if you want to use your host's libSDL instead of the minimal libsdl built |
224 | # by libsdl-native then uncomment the ASSUME_PROVIDED line below. | ||
224 | PACKAGECONFIG_append_pn-qemu-native = " sdl" | 225 | PACKAGECONFIG_append_pn-qemu-native = " sdl" |
225 | PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" | 226 | PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" |
226 | ASSUME_PROVIDED += "libsdl-native" | 227 | #ASSUME_PROVIDED += "libsdl-native" |
227 | 228 | ||
228 | 229 | ||
229 | # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to | 230 | # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to |