Author: waldi Date: Wed Mar 9 11:06:05 2011 New Revision: 821 Log: debian/patches: Fold some patches. Deleted: trunk/xen/debian/patches/tools-console-rpath.diff trunk/xen/debian/patches/tools-libxc-rpath.diff Modified: trunk/xen/debian/patches/series trunk/xen/debian/patches/tools-console-prefix.diff trunk/xen/debian/patches/tools-libxc-prefix.diff Modified: trunk/xen/debian/patches/series =============================================================================--- trunk/xen/debian/patches/series Wed Mar 9 11:02:18 2011 (r820) +++ trunk/xen/debian/patches/series Wed Mar 9 11:06:05 2011 (r821) @@ -7,12 +7,10 @@ tools-blktap2-libs.patch tools-blktap2-prefix.patch tools-console-prefix.diff -tools-console-rpath.diff tools-flask-prefix.diff tools-libfsimage-prefix.diff tools-libfsimage-rpath.diff tools-libxc-prefix.diff -tools-libxc-rpath.diff tools-libxl-prefix.diff tools-misc-prefix.diff tools-misc-rpath.diff Modified: trunk/xen/debian/patches/tools-console-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-console-prefix.diff Wed Mar 9 11:02:18 2011 (r820) +++ trunk/xen/debian/patches/tools-console-prefix.diff Wed Mar 9 11:06:05 2011 (r821) @@ -1,6 +1,14 @@ --- a/tools/console/Makefile +++ b/tools/console/Makefile -@@ -29,9 +29,7 @@ +@@ -8,6 +8,7 @@ + CFLAGS += $(CFLAGS_libxenstore) + LDFLAGS += $(LDFLAGS_libxenctrl) + LDFLAGS += $(LDFLAGS_libxenstore) ++LDFLAGS += $(call LDFLAGS_RPATH,../lib) + + BIN = xenconsoled xenconsole + +@@ -29,9 +30,7 @@ .PHONY: install install: $(BIN) Modified: trunk/xen/debian/patches/tools-libxc-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-libxc-prefix.diff Wed Mar 9 11:02:18 2011 (r820) +++ trunk/xen/debian/patches/tools-libxc-prefix.diff Wed Mar 9 11:06:05 2011 (r821) @@ -26,3 +26,21 @@ $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR) .PHONY: TAGS +@@ -142,7 +142,7 @@ + ln -sf $< $@ + + libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ $(PTHREAD_LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^ $(PTHREAD_LIBS) + + # libxenguest + +@@ -174,7 +174,7 @@ + + libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l) + libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) + + -include $(DEPS) +