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

[Bastian Blank]

Author: waldi
Date: Wed Mar  9 11:41:53 2011
New Revision: 822

Log:
* debian/patches/series: Add new patch.
* debian/patches/tools-libxl-link.diff: Fix linking.

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

Modified: trunk/xen/debian/patches/series
==============================================================================
--- trunk/xen/debian/patches/series	Wed Mar  9 11:06:05 2011	(r821)
+++ trunk/xen/debian/patches/series	Wed Mar  9 11:41:53 2011	(r822)
@@ -32,6 +32,7 @@
 tools-flask-abiname.diff
 tools-libfsimage-abiname.diff
 tools-libxc-abiname.diff
+tools-libxl-link.diff
 
 tools-python-xen-relative-path.diff
 tools-misc-xend-startup.diff

Added: trunk/xen/debian/patches/tools-libxl-link.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-libxl-link.diff	Wed Mar  9 11:41:53 2011	(r822)
@@ -0,0 +1,53 @@
+--- a/tools/libxl/Makefile
++++ b/tools/libxl/Makefile
+@@ -15,7 +15,8 @@
+ CFLAGS += -I. -fPIC
+ CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
+ 
+-LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) $(call LDFLAGS_RPATH,../lib)
++LDFLAGS_XL =  -Wl,-rpath-link,$(XEN_LIBXC),-rpath-link,$(XEN_XENSTORE) $(call LDFLAGS_RPATH,../lib)
++LDFLAGS_LIBXL = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) $(call LDFLAGS_RPATH)
+ 
+ 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 @@
+ AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c
+ LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o
+ 
+-CLIENTS = xl
+-
+ .PHONY: all
+-all: $(CLIENTS) libxenlight.so libxenlight.a libxlutil.so libxlutil.a \
++all: xl libxenlight.so libxenlight.a libxlutil.so libxlutil.a \
+ 	$(AUTOSRCS) $(AUTOINCS)
+ 
+ $(AUTOINCS): $(AUTOSRCS)
+@@ -59,7 +58,7 @@
+ 	ln -sf $< $@
+ 
+ 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.a: $(LIBXL_OBJS)
+ 	$(AR) rcs libxenlight.a $^
+@@ -85,8 +84,8 @@
+ xl_cmdtable.o: xl_cmdtable.c
+ 	$(CC) $(CFLAGS) -c xl_cmdtable.c
+ 
+-$(CLIENTS): xl.o xl_cmdimpl.o xl_cmdtable.o libxlutil.so libxenlight.so
+-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++xl: xl.o xl_cmdimpl.o xl_cmdtable.o libxlutil.so libxenlight.so
++	$(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS_XL)
+ 
+ .PHONY: install
+ install: all
+@@ -109,7 +108,7 @@
+ 
+ .PHONY: clean
+ clean:
+-	$(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS)
++	$(RM) -f _*.h *.o *.so* *.a xl $(DEPS)
+ #	$(RM) -f $(AUTOSRCS) $(AUTOINCS)
+ 
+ distclean: clean