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

[Bastian Blank]

Author: waldi
Date: Tue Sep 11 13:21:53 2007
New Revision: 454

Log:
debian/patches/tools-lib-abiname.diff: Also handle libflask.


Modified:
   trunk/xen-unstable/debian/patches/tools-lib-abiname.diff

Modified: trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-lib-abiname.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-lib-abiname.diff	Tue Sep 11 13:21:53 2007
@@ -205,3 +205,48 @@
  
  -include $(DEPS)
  
+--- xen-unstable.orig/tools/flask/libflask/Makefile
++++ xen-unstable/tools/flask/libflask/Makefile
+@@ -1,6 +1,3 @@
+-MAJOR    = 1.0
+-MINOR    = 0
+-
+ XEN_ROOT = ../../..
+ include $(XEN_ROOT)/tools/Rules.mk
+ 
+@@ -22,7 +19,7 @@
+ PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
+ 
+ LIB := libflask.a
+-LIB += libflask.so libflask.so.$(MAJOR) libflask.so.$(MAJOR).$(MINOR)
++LIB += libflask.so
+ 
+ .PHONY: all
+ all: build
+@@ -35,10 +32,8 @@
+ install: build
+ 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+ 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
+-	$(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_PROG) libflask.so $(DESTDIR)/usr/$(LIBDIR)
+ 	$(INSTALL_DATA) libflask.a $(DESTDIR)/usr/$(LIBDIR)
+-	ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so.$(MAJOR)
+-	ln -sf libflask.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so
+ 	$(INSTALL_DATA) include/flask_op.h $(DESTDIR)/usr/include
+ 
+ .PHONY: TAGS
+@@ -54,12 +49,7 @@
+ libflask.a: $(LIB_OBJS)
+ 	$(AR) rc $@ $^
+ 
+-libflask.so: libflask.so.$(MAJOR)
+-	ln -sf $< $@
+-libflask.so.$(MAJOR): libflask.so.$(MAJOR).$(MINOR)
+-	ln -sf $< $@
+-
+-libflask.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libflask.so.$(MAJOR) -shared -o $@ $^
++libflask.so: $(PIC_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^
+ 
+ -include $(DEPS)