[Pkg-xen-changes] r482 - in trunk/xen-3/debian: . patches

[Bastian Blank]

Author: waldi
Date: Sat Nov 24 17:30:35 2007
New Revision: 482

Log:
* debian/changelog: Update.
* debian/patches/tools-lib-abiname.diff: Refresh.
* debian/patches/tools-rpath.diff: Add missing rpath definitions.


Modified:
   trunk/xen-3/debian/changelog
   trunk/xen-3/debian/patches/tools-lib-abiname.diff
   trunk/xen-3/debian/patches/tools-rpath.diff

Modified: trunk/xen-3/debian/changelog
==============================================================================
--- trunk/xen-3/debian/changelog	(original)
+++ trunk/xen-3/debian/changelog	Sat Nov 24 17:30:35 2007
@@ -1,3 +1,9 @@
+xen-3 (3.1.2-2) UNRELEASED; urgency=low
+
+  * Add missing rpath definitions.
+
+ -- Bastian Blank <waldi at debian.org>  Sat, 24 Nov 2007 17:29:21 +0000
+
 xen-3 (3.1.2-1) unstable; urgency=high
 
   * New upstream release:

Modified: trunk/xen-3/debian/patches/tools-lib-abiname.diff
==============================================================================
--- trunk/xen-3/debian/patches/tools-lib-abiname.diff	(original)
+++ trunk/xen-3/debian/patches/tools-lib-abiname.diff	Sat Nov 24 17:30:35 2007
@@ -148,7 +148,7 @@
  libblktap.a: $(OBJS) 
 -	$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
 +	$(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
- 	      -L$(XEN_XENSTORE) -l xenstore                                \
+ 	      -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore                                \
 -	      -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
 -	ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
 -	ln -sf libblktap.so.$(MAJOR) libblktap.so

Modified: trunk/xen-3/debian/patches/tools-rpath.diff
==============================================================================
--- trunk/xen-3/debian/patches/tools-rpath.diff	(original)
+++ trunk/xen-3/debian/patches/tools-rpath.diff	Sat Nov 24 17:30:35 2007
@@ -60,3 +60,36 @@
                 include_dirs       = include_dirs + [ "ptsname" ],
                 library_dirs       = library_dirs,
                 libraries          = libraries,
+--- xen-3.orig/tools/blktap/drivers/Makefile
++++ xen-3/tools/blktap/drivers/Makefile
+@@ -51,7 +51,7 @@
+ qcow-util: img2qcow qcow2raw qcow-create
+ 
+ img2qcow qcow2raw qcow-create: %: $(BLK-OBJS)
+-	$(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
++	$(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
+ 
+ install: all
+ 	$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
+--- xen-3.orig/tools/blktap/lib/Makefile
++++ xen-3/tools/blktap/lib/Makefile
+@@ -52,7 +52,7 @@
+ 
+ libblktap.a: $(OBJS) 
+ 	$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
+-	      -L$(XEN_XENSTORE) -l xenstore                                \
++	      -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore                                \
+ 	      -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
+ 	ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
+ 	ln -sf libblktap.so.$(MAJOR) libblktap.so
+--- xen-3.orig/tools/xentrace/Makefile
++++ xen-3/tools/xentrace/Makefile
+@@ -52,6 +52,6 @@
+ 	$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
+ 
+ %: %.c $(HDRS) Makefile
+-	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
++	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
+ xentrace_%: %.c $(HDRS) Makefile
+-	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
++	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl