Bastian Blank
2006-Aug-18 16:26 UTC
[Pkg-xen-changes] r224 - trunk/xen-unstable/debian/patches
Author: waldi
Date: Fri Aug 18 16:25:45 2006
New Revision: 224
Modified:
trunk/xen-unstable/debian/patches/libdir.dpatch
Log:
debian/patches/libdir.dpatch: Update.
Modified: trunk/xen-unstable/debian/patches/libdir.dpatch
=============================================================================---
trunk/xen-unstable/debian/patches/libdir.dpatch (original)
+++ trunk/xen-unstable/debian/patches/libdir.dpatch Fri Aug 18 16:25:45 2006
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad xen-unstable~/tools/Rules.mk xen-unstable/tools/Rules.mk
---- xen-unstable~/tools/Rules.mk 2006-07-05 21:04:43.000000000 +0200
-+++ xen-unstable/tools/Rules.mk 2006-07-05 21:12:16.000000000 +0200
+--- xen-unstable~/tools/Rules.mk 2006-08-18 15:35:41.000000000 +0000
++++ xen-unstable/tools/Rules.mk 2006-08-18 15:44:20.687188297 +0000
@@ -12,6 +12,9 @@
XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
@@ -19,8 +19,8 @@
CFLAGS += -D__XEN_TOOLS__
diff -urNad xen-unstable~/tools/console/Makefile
xen-unstable/tools/console/Makefile
---- xen-unstable~/tools/console/Makefile 2006-07-05 21:04:43.000000000 +0200
-+++ xen-unstable/tools/console/Makefile 2006-07-05 21:12:16.000000000 +0200
+--- xen-unstable~/tools/console/Makefile 2006-08-18 15:35:41.000000000 +0000
++++ xen-unstable/tools/console/Makefile 2006-08-18 15:44:20.687188297 +0000
@@ -25,11 +25,11 @@
$(RM) client/*.o daemon/*.o
@@ -35,21 +35,9 @@
-lxenctrl -lxenstore
.PHONY: install
-diff -urNad xen-unstable~/tools/ioemu/target-i386-dm/Makefile
xen-unstable/tools/ioemu/target-i386-dm/Makefile
---- xen-unstable~/tools/ioemu/target-i386-dm/Makefile 2006-07-05
21:04:43.000000000 +0200
-+++ xen-unstable/tools/ioemu/target-i386-dm/Makefile 2006-07-05
21:12:16.000000000 +0200
-@@ -195,7 +195,7 @@
- #########################################################
-
- DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
--LIBS+=-lm -L../../libxc -lxenctrl -lxenguest -L../../xenstore -lxenstore
-+LIBS+=-lm $(RPATH_ARG) -L../../libxc -lxenctrl -lxenguest -L../../xenstore
-lxenstore
- ifndef CONFIG_USER_ONLY
- LIBS+=-lz
- endif
diff -urNad xen-unstable~/tools/libxc/Makefile
xen-unstable/tools/libxc/Makefile
---- xen-unstable~/tools/libxc/Makefile 2006-07-05 21:04:43.000000000 +0200
-+++ xen-unstable/tools/libxc/Makefile 2006-07-05 21:13:13.000000000 +0200
+--- xen-unstable~/tools/libxc/Makefile 2006-08-18 15:35:44.000000000 +0000
++++ xen-unstable/tools/libxc/Makefile 2006-08-18 15:44:20.691186500 +0000
@@ -4,9 +4,6 @@
INSTALL_DATA = $(INSTALL) -m0644
INSTALL_DIR = $(INSTALL) -d -m0755
@@ -60,7 +48,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
-@@ -53,11 +50,9 @@
+@@ -55,11 +52,9 @@
GUEST_LIB_OBJS := $(patsubst %.c,%.o,$(GUEST_SRCS-y))
GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y))
@@ -74,7 +62,7 @@
.PHONY: all
all: build
-@@ -77,18 +72,12 @@
+@@ -79,18 +74,12 @@
.PHONY: install
install: build
@@ -96,7 +84,7 @@
$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
.PHONY: TAGS
-@@ -114,25 +103,15 @@
+@@ -118,26 +107,16 @@
libxenctrl.a: $(CTRL_LIB_OBJS)
$(AR) rc $@ $^
@@ -126,9 +114,10 @@
+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenguest.so -shared -o $@ $^
-lz -lxenctrl
-include $(DEPS)
+
diff -urNad xen-unstable~/tools/misc/Makefile xen-unstable/tools/misc/Makefile
---- xen-unstable~/tools/misc/Makefile 2006-07-05 21:04:43.000000000 +0200
-+++ xen-unstable/tools/misc/Makefile 2006-07-05 21:12:16.000000000 +0200
+--- xen-unstable~/tools/misc/Makefile 2006-08-18 15:35:44.000000000 +0000
++++ xen-unstable/tools/misc/Makefile 2006-08-18 15:44:20.691186500 +0000
@@ -55,4 +55,4 @@
$(CC) -c $(CFLAGS) -o $@ $<
@@ -136,8 +125,8 @@
- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
diff -urNad xen-unstable~/tools/misc/cpuperf/Makefile
xen-unstable/tools/misc/cpuperf/Makefile
---- xen-unstable~/tools/misc/cpuperf/Makefile 2006-07-05 21:04:43.000000000
+0200
-+++ xen-unstable/tools/misc/cpuperf/Makefile 2006-07-05 21:12:16.000000000
+0200
+--- xen-unstable~/tools/misc/cpuperf/Makefile 2006-08-18 15:35:44.000000000
+0000
++++ xen-unstable/tools/misc/cpuperf/Makefile 2006-08-18 15:44:20.691186500
+0000
@@ -37,7 +37,7 @@
$(CC) $(CFLAGS) -o $@ $<
@@ -148,8 +137,8 @@
cpuperf-perfcntr: cpuperf.c $(HDRS) Makefile
$(CC) $(CFLAGS) -DPERFCNTR -o $@ $<
diff -urNad xen-unstable~/tools/python/setup.py
xen-unstable/tools/python/setup.py
---- xen-unstable~/tools/python/setup.py 2006-07-05 21:04:43.000000000 +0200
-+++ xen-unstable/tools/python/setup.py 2006-07-05 21:12:16.000000000 +0200
+--- xen-unstable~/tools/python/setup.py 2006-08-18 15:35:42.000000000 +0000
++++ xen-unstable/tools/python/setup.py 2006-08-18 15:44:20.691186500 +0000
@@ -5,6 +5,7 @@
XEN_ROOT = "../.."
@@ -175,8 +164,8 @@
library_dirs = library_dirs,
libraries = libraries,
diff -urNad xen-unstable~/tools/python/xen/util/auxbin.py
xen-unstable/tools/python/xen/util/auxbin.py
---- xen-unstable~/tools/python/xen/util/auxbin.py 2006-07-05 21:04:43.000000000
+0200
-+++ xen-unstable/tools/python/xen/util/auxbin.py 2006-07-05 21:15:43.000000000
+0200
+--- xen-unstable~/tools/python/xen/util/auxbin.py 2006-08-18 15:35:42.000000000
+0000
++++ xen-unstable/tools/python/xen/util/auxbin.py 2006-08-18 15:45:41.899480794
+0000
@@ -16,13 +16,9 @@
#===========================================================================
@@ -187,8 +176,8 @@
LIB_BIN_SUFFIX = "xen/bin"
-## The architectures on which the LIB_64 directory is used. This
--# deliberately excludes ia64.
--LIB_64_ARCHS = [ ''x86_64'', ''ppc64'',
''s390x'', ''sparc64'']
+-# deliberately excludes ia64 and ppc64.
+-LIB_64_ARCHS = [ ''x86_64'', ''s390x'',
''sparc64'']
import os
@@ -203,22 +192,52 @@
- return LIB_32
+ return LIB
diff -urNad xen-unstable~/tools/xenstore/Makefile
xen-unstable/tools/xenstore/Makefile
---- xen-unstable~/tools/xenstore/Makefile 2006-07-05 21:04:43.000000000 +0200
-+++ xen-unstable/tools/xenstore/Makefile 2006-07-05 21:12:16.000000000 +0200
-@@ -170,8 +170,8 @@
+--- xen-unstable~/tools/xenstore/Makefile 2006-08-18 15:35:42.000000000 +0000
++++ xen-unstable/tools/xenstore/Makefile 2006-08-18 15:44:56.347161969 +0000
+@@ -2,9 +2,6 @@
+ include $(XEN_ROOT)/tools/Rules.mk
+ XEN_LIBXC = $(XEN_ROOT)/tools/libxc
+
+-MAJOR = 3.0
+-MINOR = 0
+-
+ INSTALL = install
+ INSTALL_DATA = $(INSTALL) -m0644
+ INSTALL_PROG = $(INSTALL) -m0755
+@@ -89,13 +86,8 @@
+ talloc_test.o: talloc.c
+ $(COMPILE.c) -o $@ $<
+
+-libxenstore.so: libxenstore.so.$(MAJOR)
+- ln -sf $< $@
+-libxenstore.so.$(MAJOR): libxenstore.so.$(MAJOR).$(MINOR)
+- ln -sf $< $@
+-
+-libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenstore.so.$(MAJOR) -shared -o
$@ $^ -lpthread
++libxenstore.so: xs.opic xs_lib.opic
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lpthread
+
+ libxenstore.a: xs.o xs_lib.o
+ ar rcs libxenstore.a $^
+@@ -181,11 +173,9 @@
$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
- $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
-- $(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
+- $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+- ln -sf libxenstore.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
+- ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so
+- $(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
+ $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)/xen
-+ $(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)/xen
++ $(INSTALL_PROG) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)/xen
++ $(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)/xen
$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
diff -urNad xen-unstable~/tools/xentrace/Makefile
xen-unstable/tools/xentrace/Makefile
---- xen-unstable~/tools/xentrace/Makefile 2006-07-05 21:04:43.000000000 +0200
-+++ xen-unstable/tools/xentrace/Makefile 2006-07-05 21:12:16.000000000 +0200
+--- xen-unstable~/tools/xentrace/Makefile 2006-08-18 15:35:42.000000000 +0000
++++ xen-unstable/tools/xentrace/Makefile 2006-08-18 15:44:20.691186500 +0000
@@ -57,4 +57,4 @@
$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)