[Pkg-xen-changes] r248 - trunk/xen-3.0/debian/patches

[Bastian Blank]

Author: waldi
Date: Tue Aug 22 09:40:32 2006
New Revision: 248

Added:
   trunk/xen-3.0/debian/patches/libs.dpatch   (contents, props changed)
Modified:
   trunk/xen-3.0/debian/patches/00list

Log:
Remove abinames again.

* debian/patches/00list: Add libs.
* debian/patches/libs.dpatch: Add.


Modified: trunk/xen-3.0/debian/patches/00list
==============================================================================
--- trunk/xen-3.0/debian/patches/00list	(original)
+++ trunk/xen-3.0/debian/patches/00list	Tue Aug 22 09:40:32 2006
@@ -4,3 +4,4 @@
 version
 default-network
 qemu-config
+libs

Added: trunk/xen-3.0/debian/patches/libs.dpatch
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/patches/libs.dpatch	Tue Aug 22 09:40:32 2006
@@ -0,0 +1,83 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## libs.dpatch by Bastian Blank <waldi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad xen-3.0~/tools/libxc/Makefile xen-3.0/tools/libxc/Makefile
+--- xen-3.0~/tools/libxc/Makefile	2006-08-21 05:12:27.000000000 +0000
++++ xen-3.0/tools/libxc/Makefile	2006-08-21 06:40:50.652754733 +0000
+@@ -4,9 +4,6 @@
+ INSTALL_DATA	= $(INSTALL) -m0644
+ INSTALL_DIR	= $(INSTALL) -d -m0755
+ 
+-MAJOR    = 3.0
+-MINOR    = 0
+-
+ XEN_ROOT = ../..
+ include $(XEN_ROOT)/tools/Rules.mk
+ 
+@@ -61,11 +58,9 @@
+ LIB_BUILD_OBJS := $(patsubst %.c,%.o,$(BUILD_SRCS))
+ PIC_BUILD_OBJS := $(patsubst %.c,%.opic,$(BUILD_SRCS))
+ 
+-LIB := libxenctrl.a
+-LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
++LIB += libxenctrl.so
+ 
+-LIB += libxenguest.a
+-LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
++LIB += libxenguest.so
+ 
+ .PHONY: all
+ all: build
+@@ -87,16 +82,10 @@
+ install: build
+ 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+ 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
+-	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+-	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
+-	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
+-	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
++	$(INSTALL_PROG) libxenctrl.so $(DESTDIR)/usr/$(LIBDIR)
+ 	$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
+ 
+-	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+-	$(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
+-	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
+-	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
++	$(INSTALL_PROG) libxenguest.so $(DESTDIR)/usr/$(LIBDIR)
+ 	$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
+ 
+ .PHONY: TAGS
+@@ -122,25 +111,15 @@
+ libxenctrl.a: $(LIB_OBJS)
+ 	$(AR) rc $@ $^
+ 
+-libxenctrl.so: libxenctrl.so.$(MAJOR)
+-	ln -sf $< $@
+-libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
+-	ln -sf $< $@
+-
+-libxenctrl.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenctrl.so.$(MAJOR) -shared -o $@ $^
++libxenctrl.so: $(PIC_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^
+ 
+ # libxenguest
+ 
+ libxenguest.a: $(LIB_BUILD_OBJS)
+ 	$(AR) rc $@ $^
+ 
+-libxenguest.so: libxenguest.so.$(MAJOR)
+-	ln -sf $< $@
+-libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
+-	ln -sf $< $@
+-
+-libxenguest.so.$(MAJOR).$(MINOR): $(PIC_BUILD_OBJS) libxenctrl.so
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenguest.so.$(MAJOR) -shared -o $@ $^ -lz -lxenctrl
++libxenguest.so: $(PIC_BUILD_OBJS) libxenctrl.so
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lz -lxenctrl
+ 
+ -include $(DEPS)