[meta-virtualization] [PATCH v2] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup

[Philip Tricca]

On 11/05/2013 09:36 PM, Chris Patterson wrote:
> FYI - removing libgl as a dependency exposes another hardcoded
> dependency/check/path (in this case adding /usr/include/GL to the
> include path for qemu-xen-traditional).  Probably won't hit it unless
> you have the opengl or libsdl dev bits on your host (as I do).
> 
> WARNING: QA Issue: xen: The compile log indicates that host include
> and/or library paths were used.
> ...
>   CC    audio/sdlaudio.o
> cc1: warning: include location "/usr/include/GL" is unsafe for
> cross-compilation [-Wpoison-system-directories]
> ....

Yuck. I'm seeing this in the qemu-xen-traditional configure script. It's
a separate issue from this patch though no?

- Philip

> On Tue, Nov 5, 2013 at 9:17 PM, Philip Tricca <flihp at twobit.us
> <mailto:flihp at twobit.us>> wrote:
> 
>     This patch moves the optional SDL dependency to a PACKAGECONFIG
>     entry. It also cleans up dependencies on both the virtual libsdl
>     and libsdl. The dependency on libgl is also removed. libGL support
>     should be enabled with the 'opengl' distro feature instead. The
>     dependency on glib-2.0 is now explicit as well.
> 
>     Signed-off-by: Philip Tricca <flihp at twobit.us <mailto:flihp at twobit.us>>
>     ---
>      recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb> |    6 ++++--
>      1 file changed, 4 insertions(+), 2 deletions(-)
> 
>     diff --git a/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
>     b/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
>     index 09c25aa..283da28 100644
>     --- a/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
>     +++ b/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
>     @@ -21,17 +21,19 @@ COMPATIBLE_HOST = '(x86_64.*).*-linux'
>      inherit autotools gettext setuptools update-rc.d
> 
>      PACKAGECONFIG ??= " \
>     +    sdl \
>          xsm \
>      "
>     +PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl,"
>      PACKAGECONFIG[xsm] =
>     "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
> 
>     -DEPENDS = "util-linux util-linux-native file-native zlib ncurses
>     openssl bison-native flex-native gettext dev86-native iasl-native
>     pciutils virtual/libgl virtual/libsdl bridge-utils iproute2 procps
>     yajl pixman python python-setuptools-native xz xz-native libsdl"
>     +DEPENDS = "util-linux util-linux-native file-native zlib ncurses
>     openssl bison-native flex-native gettext dev86-native iasl-native
>     pciutils bridge-utils iproute2 procps yajl pixman python
>     python-setuptools-native xz xz-native glib-2.0"
> 
>      # inherit setuptools adds python to RDEPENDS, override it
>      RDEPENDS_${PN} = ""
> 
>      RDEPENDS_${PN}-base = "\
>     -    libgcc libsdl udev bash perl xz \
>     +    libgcc udev bash perl xz \
>          ${PN}-blktap \
>          ${PN}-console \
>          ${PN}-libblktapctl \
>     --
>     1.7.10.4
> 
>     _______________________________________________
>     meta-virtualization mailing list
>     meta-virtualization at yoctoproject.org
>     <mailto:meta-virtualization at yoctoproject.org>
>     https://lists.yoctoproject.org/listinfo/meta-virtualization
> 
>