package/base/xen-tools/hotfix.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../xen-tools/compile-fix.patch
   5 # Copyright (C) 2010 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 diff -Nur xen-3.4.2-orig/tools/ioemu-qemu-xen/configure xen-3.4.2/tools/ioemu-qemu-xen/configure
  18 --- xen-3.4.2-orig/tools/ioemu-qemu-xen/configure       2010-01-14 13:16:34.000000000 +0000
  19 +++ xen-3.4.2/tools/ioemu-qemu-xen/configure    2010-01-14 13:19:09.000000000 +0000
  20 @@ -1433,7 +1433,7 @@
  21    if test "$target_softmmu" = "no" -o "$static" = "yes"; then
  22      echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
  23    elif test "$sdl_x11" = "yes" ; then
  24 -    echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_mak
  25 +    echo "SDL_LIBS=`$sdl_config --libs` `pkg-config --cflags x11 --libs`" >> $config_mak
  26    else
  27      echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak
  28    fi
  29 diff -Nur xen-3.4.2-orig/tools/libxc/Makefile xen-3.4.2/tools/libxc/Makefile
  30 --- xen-3.4.2-orig/tools/libxc/Makefile 2010-01-14 13:16:34.000000000 +0000
  31 +++ xen-3.4.2/tools/libxc/Makefile      2010-01-14 13:17:50.000000000 +0000
  32 @@ -169,7 +169,7 @@
  33
  34  libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
  35  libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
  36 -       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
  37 +       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lbz2 -lxenctrl $(PTHREAD_LIBS)
  38
  39  -include $(DEPS)
  40
  41 diff -Nur xen-3.4.2-orig/tools/xcutils/Makefile xen-3.4.2/tools/xcutils/Makefile
  42 --- xen-3.4.2-orig/tools/xcutils/Makefile       2010-01-14 13:16:35.000000000 +0000
  43 +++ xen-3.4.2/tools/xcutils/Makefile    2010-01-14 13:17:22.000000000 +0000
  44 @@ -16,7 +16,7 @@
  45
  46  PROGRAMS = xc_restore xc_save readnotes lsevtchn
  47
  48 -LDLIBS   = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
  49 +LDLIBS   = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) -lbz2
  50
  51  .PHONY: all
  52  all: build