[Pkg-xen-changes] r265 - trunk/xen-unstable/debian/patches

Bastian Blank waldi at costa.debian.org
Tue Aug 22 11:52:19 UTC 2006 

Author: waldi
Date: Tue Aug 22 11:52:10 2006
New Revision: 265

Modified:
   trunk/xen-unstable/debian/patches/prefix-utils.dpatch

Log:
debian/patches/prefix-utils.dpatch: Add another bunch of rpath definitions.


Modified: trunk/xen-unstable/debian/patches/prefix-utils.dpatch
==============================================================================
--- trunk/xen-unstable/debian/patches/prefix-utils.dpatch	(original)
+++ trunk/xen-unstable/debian/patches/prefix-utils.dpatch	Tue Aug 22 11:52:10 2006
@@ -8,7 +8,7 @@
 @DPATCH@
 diff -urNad xen-unstable~/Config.mk xen-unstable/Config.mk
 --- xen-unstable~/Config.mk	2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/Config.mk	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/Config.mk	2006-08-22 11:45:43.582050172 +0000
 @@ -43,6 +43,11 @@
  
  include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
@@ -23,7 +23,7 @@
  EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
 diff -urNad xen-unstable~/config/ia64.mk xen-unstable/config/ia64.mk
 --- xen-unstable~/config/ia64.mk	2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/ia64.mk	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/config/ia64.mk	2006-08-22 11:45:43.582050172 +0000
 @@ -1,5 +1,3 @@
  CONFIG_IA64 := y
  CONFIG_IOEMU := y
@@ -32,7 +32,7 @@
 -LIBDIR := lib
 diff -urNad xen-unstable~/config/powerpc64.mk xen-unstable/config/powerpc64.mk
 --- xen-unstable~/config/powerpc64.mk	2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/powerpc64.mk	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/config/powerpc64.mk	2006-08-22 11:45:43.582050172 +0000
 @@ -1,4 +1,3 @@
  CONFIG_POWERPC := y
  
@@ -40,7 +40,7 @@
 -LIBDIR := lib
 diff -urNad xen-unstable~/config/x86_32.mk xen-unstable/config/x86_32.mk
 --- xen-unstable~/config/x86_32.mk	2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/x86_32.mk	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/config/x86_32.mk	2006-08-22 11:45:43.582050172 +0000
 @@ -6,4 +6,3 @@
  CONFIG_MBOOTPACK := y
  
@@ -48,7 +48,7 @@
 -LIBDIR := lib
 diff -urNad xen-unstable~/config/x86_64.mk xen-unstable/config/x86_64.mk
 --- xen-unstable~/config/x86_64.mk	2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/x86_64.mk	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/config/x86_64.mk	2006-08-22 11:45:43.582050172 +0000
 @@ -6,4 +6,3 @@
  CONFIG_MBOOTPACK := y
  
@@ -56,7 +56,7 @@
 -LIBDIR = lib64
 diff -urNad xen-unstable~/tools/Rules.mk xen-unstable/tools/Rules.mk
 --- xen-unstable~/tools/Rules.mk	2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/Rules.mk	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/Rules.mk	2006-08-22 11:45:43.582050172 +0000
 @@ -12,6 +12,9 @@
  XEN_XENSTORE       = $(XEN_ROOT)/tools/xenstore
  XEN_LIBXENSTAT     = $(XEN_ROOT)/tools/xenstat/libxenstat/src
@@ -69,7 +69,7 @@
  CFLAGS += -D__XEN_TOOLS__
 diff -urNad xen-unstable~/tools/blktap/drivers/Makefile xen-unstable/tools/blktap/drivers/Makefile
 --- xen-unstable~/tools/blktap/drivers/Makefile	2006-08-22 09:56:47.000000000 +0000
-+++ xen-unstable/tools/blktap/drivers/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/blktap/drivers/Makefile	2006-08-22 11:46:26.031339565 +0000
 @@ -7,7 +7,7 @@
  INSTALL_PROG = $(INSTALL) -m0755
  IBIN         = blktapctrl tapdisk
@@ -79,9 +79,23 @@
  LIBAIO_DIR   = ../../libaio/src
  
  CFLAGS   += -fPIC
+@@ -48,11 +48,11 @@
+ 
+ 
+ blktapctrl: blktapctrl.c
+-	$(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c
++	$(CC) $(CFLAGS) -o blktapctrl $(LDFLAGS) $(LIBS) blktapctrl.c
+ 
+ tapdisk: $(BLK-OBJS) tapdisk.c
+ 	$(CC) $(CFLAGS) -o tapdisk $(BLK-OBJS) tapdisk.c \
+-		$(AIOLIBS) $(LIBS)
++		$(AIOLIBS) $(LDFLAGS) $(LIBS)
+ 
+ .PHONY: qcow-util
+ qcow-util: img2qcow qcow2raw qcow-create
 diff -urNad xen-unstable~/tools/console/Makefile xen-unstable/tools/console/Makefile
 --- xen-unstable~/tools/console/Makefile	2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/console/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/console/Makefile	2006-08-22 11:45:43.582050172 +0000
 @@ -2,8 +2,8 @@
  XEN_ROOT=../..
  include $(XEN_ROOT)/tools/Rules.mk
@@ -109,7 +123,7 @@
  .PHONY: install
 diff -urNad xen-unstable~/tools/misc/Makefile xen-unstable/tools/misc/Makefile
 --- xen-unstable~/tools/misc/Makefile	2006-08-22 09:56:46.000000000 +0000
-+++ xen-unstable/tools/misc/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/misc/Makefile	2006-08-22 11:45:43.582050172 +0000
 @@ -32,10 +32,10 @@
  
  .PHONY: install
@@ -133,7 +147,7 @@
 +	$(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-08-22 09:56:46.000000000 +0000
-+++ xen-unstable/tools/misc/cpuperf/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/misc/cpuperf/Makefile	2006-08-22 11:45:43.582050172 +0000
 @@ -37,14 +37,14 @@
  	$(CC) $(CFLAGS) -o $@ $<
  
@@ -153,7 +167,7 @@
  # End of $RCSfile: Makefile,v $
 diff -urNad xen-unstable~/tools/misc/lomount/Makefile xen-unstable/tools/misc/lomount/Makefile
 --- xen-unstable~/tools/misc/lomount/Makefile	2006-08-22 09:56:46.000000000 +0000
-+++ xen-unstable/tools/misc/lomount/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/misc/lomount/Makefile	2006-08-22 11:45:43.582050172 +0000
 @@ -21,7 +21,7 @@
  
  .PHONY: install
@@ -165,7 +179,7 @@
  clean:
 diff -urNad xen-unstable~/tools/pygrub/Makefile xen-unstable/tools/pygrub/Makefile
 --- xen-unstable~/tools/pygrub/Makefile	2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/pygrub/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/pygrub/Makefile	2006-08-22 11:45:43.582050172 +0000
 @@ -11,7 +11,7 @@
  .PHONY: install
  ifndef XEN_PYTHON_NATIVE_INSTALL
@@ -177,7 +191,7 @@
  	CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
 diff -urNad xen-unstable~/tools/python/Makefile xen-unstable/tools/python/Makefile
 --- xen-unstable~/tools/python/Makefile	2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/python/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/python/Makefile	2006-08-22 11:45:43.582050172 +0000
 @@ -6,15 +6,15 @@
  
  .PHONY: build
@@ -199,7 +213,7 @@
  .PHONY: test
 diff -urNad xen-unstable~/tools/python/setup.py xen-unstable/tools/python/setup.py
 --- xen-unstable~/tools/python/setup.py	2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/python/setup.py	2006-08-22 11:38:17.514573082 +0000
++++ xen-unstable/tools/python/setup.py	2006-08-22 11:45:43.582050172 +0000
 @@ -5,6 +5,8 @@
  XEN_ROOT = "../.."
  
@@ -235,7 +249,7 @@
                 libraries          = libraries,
 diff -urNad xen-unstable~/tools/xcutils/Makefile xen-unstable/tools/xcutils/Makefile
 --- xen-unstable~/tools/xcutils/Makefile	2006-08-22 09:56:47.000000000 +0000
-+++ xen-unstable/tools/xcutils/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/xcutils/Makefile	2006-08-22 11:45:43.582050172 +0000
 @@ -15,7 +15,7 @@
  XEN_ROOT	= ../..
  include $(XEN_ROOT)/tools/Rules.mk
@@ -247,7 +261,7 @@
  
 diff -urNad xen-unstable~/tools/xenmon/Makefile xen-unstable/tools/xenmon/Makefile
 --- xen-unstable~/tools/xenmon/Makefile	2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/xenmon/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/xenmon/Makefile	2006-08-22 11:45:43.582050172 +0000
 @@ -15,8 +15,6 @@
  INSTALL_DIR     = $(INSTALL) -d -m0755
  INSTALL_DATA    = $(INSTALL) -m0644
@@ -274,7 +288,7 @@
  clean:
 diff -urNad xen-unstable~/tools/xenstat/xentop/Makefile xen-unstable/tools/xenstat/xentop/Makefile
 --- xen-unstable~/tools/xenstat/xentop/Makefile	2006-08-22 09:56:47.000000000 +0000
-+++ xen-unstable/tools/xenstat/xentop/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/xenstat/xentop/Makefile	2006-08-22 11:45:43.582050172 +0000
 @@ -25,7 +25,7 @@
  prefix=/usr
  mandir=$(prefix)/share/man
@@ -286,7 +300,7 @@
  LDFLAGS += -L$(XEN_LIBXENSTAT)
 diff -urNad xen-unstable~/tools/xenstore/Makefile xen-unstable/tools/xenstore/Makefile
 --- xen-unstable~/tools/xenstore/Makefile	2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/xenstore/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/xenstore/Makefile	2006-08-22 11:45:43.582050172 +0000
 @@ -174,13 +174,13 @@
  install: all
  	$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
@@ -309,7 +323,7 @@
  	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
 diff -urNad xen-unstable~/tools/xentrace/Makefile xen-unstable/tools/xentrace/Makefile
 --- xen-unstable~/tools/xentrace/Makefile	2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/xentrace/Makefile	2006-08-22 11:36:28.691141802 +0000
++++ xen-unstable/tools/xentrace/Makefile	2006-08-22 11:45:43.582050172 +0000
 @@ -15,21 +15,20 @@
  OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))

More information about the Pkg-xen-changes mailing list