[Pkg-xen-changes] r830 - trunk/xen/debian/patches

Bastian Blank waldi at alioth.debian.org
Mon Mar 14 21:28:52 UTC 2011 

Author: waldi
Date: Mon Mar 14 21:28:33 2011
New Revision: 830

Log:
debian/patches: Clean abiname of xl libraries.

Added:
   trunk/xen/debian/patches/tools-libxl-abiname.diff
Modified:
   trunk/xen/debian/patches/series
   trunk/xen/debian/patches/tools-libxl-link.diff
   trunk/xen/debian/patches/tools-libxl-prefix.diff

Modified: trunk/xen/debian/patches/series
==============================================================================
--- trunk/xen/debian/patches/series	Wed Mar  9 17:20:43 2011	(r829)
+++ trunk/xen/debian/patches/series	Mon Mar 14 21:28:33 2011	(r830)
@@ -7,6 +7,7 @@
 tools-flask-abiname.diff
 tools-libfsimage-abiname.diff
 tools-libxc-abiname.diff
+tools-libxl-abiname.diff
 tools-libxl-link.diff
 
 config-prefix.diff

Added: trunk/xen/debian/patches/tools-libxl-abiname.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-libxl-abiname.diff	Mon Mar 14 21:28:33 2011	(r830)
@@ -0,0 +1,62 @@
+--- a/tools/libxl/Makefile
++++ b/tools/libxl/Makefile
+@@ -5,12 +5,6 @@
+ XEN_ROOT = ../..
+ include $(XEN_ROOT)/tools/Rules.mk
+ 
+-MAJOR = 1.0
+-MINOR = 0
+-
+-XLUMAJOR = 1.0
+-XLUMINOR = 0
+-
+ CFLAGS += -Werror
+ CFLAGS += -I. -fPIC
+ CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
+@@ -52,26 +46,14 @@
+ 
+ libxl_paths.c: _libxl_paths.h
+ 
+-libxenlight.so: libxenlight.so.$(MAJOR)
+-	ln -sf $< $@
+-
+-libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR)
+-	ln -sf $< $@
+-
+-libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^
++libxenlight.so: $(LIBXL_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^
+ 
+ libxenlight.a: $(LIBXL_OBJS)
+ 	$(AR) rcs libxenlight.a $^
+ 
+-libxlutil.so: libxlutil.so.$(XLUMAJOR)
+-	ln -sf $< $@
+-
+-libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR)
+-	ln -sf $< $@
+-
+-libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_CFLAGS) -o $@ $^
++libxlutil.so: $(LIBXLU_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^
+ 
+ libxlutil.a: $(LIBXLU_OBJS)
+ 	$(AR) rcs libxlutil.a $^
+@@ -95,13 +77,9 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
+ 	$(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
+-	$(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+-	ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)
+-	ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so
++	$(INSTALL_PROG) libxenlight.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR)
+-	$(INSTALL_PROG) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)
+-	ln -sf libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR)
+-	ln -sf libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so
++	$(INSTALL_PROG) libxlutil.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) libxl.h $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh

Modified: trunk/xen/debian/patches/tools-libxl-link.diff
==============================================================================
--- trunk/xen/debian/patches/tools-libxl-link.diff	Wed Mar  9 17:20:43 2011	(r829)
+++ trunk/xen/debian/patches/tools-libxl-link.diff	Mon Mar 14 21:28:33 2011	(r830)
@@ -1,6 +1,6 @@
 --- a/tools/libxl/Makefile
 +++ b/tools/libxl/Makefile
-@@ -15,7 +15,8 @@
+@@ -9,7 +9,8 @@
  CFLAGS += -I. -fPIC
  CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
  
@@ -10,7 +10,7 @@
  
  LIBXL_OBJS-y = osdeps.o libxl_paths.o
  LIBXL_OBJS = flexarray.o libxl.o libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y)
-@@ -24,10 +25,8 @@
+@@ -18,10 +19,8 @@
  AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c
  LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o
  
@@ -22,16 +22,16 @@
  	$(AUTOSRCS) $(AUTOINCS)
  
  $(AUTOINCS): $(AUTOSRCS)
-@@ -59,7 +58,7 @@
- 	ln -sf $< $@
+@@ -47,7 +46,7 @@
+ libxl_paths.c: _libxl_paths.h
  
- libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_LIBXL) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^
+ libxenlight.so: $(LIBXL_OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_LIBXL) $(SHLIB_CFLAGS) -o $@ $^
  
  libxenlight.a: $(LIBXL_OBJS)
  	$(AR) rcs libxenlight.a $^
-@@ -85,8 +84,8 @@
+@@ -67,8 +66,8 @@
  xl_cmdtable.o: xl_cmdtable.c
  	$(CC) $(CFLAGS) -c xl_cmdtable.c
  
@@ -42,7 +42,7 @@
  
  .PHONY: install
  install: all
-@@ -108,7 +107,7 @@
+@@ -86,7 +85,7 @@
  
  .PHONY: clean
  clean:

Modified: trunk/xen/debian/patches/tools-libxl-prefix.diff
==============================================================================
--- trunk/xen/debian/patches/tools-libxl-prefix.diff	Wed Mar  9 17:20:43 2011	(r829)
+++ trunk/xen/debian/patches/tools-libxl-prefix.diff	Mon Mar 14 21:28:33 2011	(r830)
@@ -1,6 +1,6 @@
 --- a/tools/libxl/Makefile
 +++ b/tools/libxl/Makefile
-@@ -15,8 +15,8 @@
+@@ -9,8 +9,8 @@
  CFLAGS += -I. -fPIC
  CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
  
@@ -11,31 +11,20 @@
  
  LIBXL_OBJS-y = osdeps.o libxl_paths.o
  LIBXL_OBJS = flexarray.o libxl.o libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y)
-@@ -89,18 +89,19 @@
- 
+@@ -72,13 +72,14 @@
  .PHONY: install
  install: all
--	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
-+	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
- 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
 +	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
  	$(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
--	$(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
--	$(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
--	ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)
--	ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so
-+	$(INSTALL_PROG) xl $(DESTDIR)$(PRIVATE_BINDIR)
-+	$(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
-+	ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenlight.so.$(MAJOR)
-+	ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenlight.so
+ 	$(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
+-	$(INSTALL_PROG) libxenlight.so $(DESTDIR)$(LIBDIR)
++	$(INSTALL_PROG) libxenlight.so $(DESTDIR)$(PRIVATE_LIBDIR)
  	$(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR)
--	$(INSTALL_PROG) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)
--	ln -sf libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR)
--	ln -sf libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so
-+	$(INSTALL_PROG) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
-+	ln -sf libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxlutil.so.$(XLUMAJOR)
-+	ln -sf libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxlutil.so
+-	$(INSTALL_PROG) libxlutil.so $(DESTDIR)$(LIBDIR)
++	$(INSTALL_PROG) libxlutil.so $(DESTDIR)$(PRIVATE_LIBDIR)
  	$(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR)
  	$(INSTALL_DATA) libxl.h $(DESTDIR)$(INCLUDEDIR)
  	$(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh

More information about the Pkg-xen-changes mailing list