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

[Gwenole Beauchesne]

Hi,

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

--- qemu-0.5.0/Makefile.target.sdl-static-libs  2003-11-07 09:32:10.000000000 
+0100
+++ qemu-0.5.0/Makefile.target  2003-11-07 09:32:51.000000000 +0100
@@ -179,11 +179,10 @@ endif
 VL_OBJS=vl.o block.o vga.o
 ifdef CONFIG_SDL
 VL_OBJS+=sdl.o
-SDL_LIBS+=-L/usr/X11R6/lib -lX11 -lXext -lXv -ldl -lm
 endif
 
 $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
-       $(CC) -static -Wl,-T,$(SRC_PATH)/i386-vl.ld -o $@ $^ $(LIBS) $(SDL_LIBS)
+       $(CC) -static -Wl,-T,$(SRC_PATH)/i386-vl.ld -o $@ $^ $(LIBS) 
$(SDL_STATIC_LIBS)
 
 sdl.o: sdl.c
        $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
--- qemu-0.5.0/configure.sdl-static-libs        2003-11-07 09:32:10.000000000 
+0100
+++ qemu-0.5.0/configure        2003-11-07 09:32:19.000000000 +0100
@@ -306,6 +306,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