Re: [Qemu-devel] [PATCH] sdl-config --static-libs

[Gwenole Beauchesne]

On Fri, 7 Nov 2003, Gwenole Beauchesne wrote:

> Since we intend to link qemu system emulator with static libraries, better 
> use sdl-config --static-libs to get the list. Otherwise, we may have 
> hardcoded non lib64 aware paths.
> 
> Patch against 0.5.0

Against 0.5.1 (CVS):

--- qemu-0.5.0/Makefile.target.sdl-static-libs  2003-11-07 11:18:47.000000000 
+0100
+++ qemu-0.5.0/Makefile.target  2003-11-07 11:24:09.000000000 +0100
@@ -190,9 +190,14 @@ endif
 ifdef CONFIG_STATIC
 VL_LDFLAGS+=-static
 endif
+ifeq ($(findstring -static, $(VL_LDFLAGS)),-static)
+VL_SDL_LIBS=$(SDL_STATIC_LIBS)
+else
+VL_SDL_LIBS=$(SDL_LIBS)
+endif
 
 $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
-       $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS)
+       $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(VL_SDL_LIBS)
 
 sdl.o: sdl.c
        $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
--- qemu-0.5.0/configure.sdl-static-libs        2003-11-07 11:18:47.000000000 
+0100
+++ qemu-0.5.0/configure        2003-11-07 11:18:47.000000000 +0100
@@ -301,6 +301,7 @@ if test "$sdl" = "yes" ; then
   echo "CONFIG_SDL=yes" >> $config_mak
   echo "#define CONFIG_SDL 1" >> $config_h
   echo "SDL_LIBS=`sdl-config --libs`" >> $config_mak
+  echo "SDL_STATIC_LIBS=`sdl-config --static-libs`" >> $config_mak
   echo "SDL_CFLAGS=`sdl-config --cflags`" >> $config_mak
 fi
 echo -n "VERSION=" >>$config_mak