Author: waldi Date: Wed Mar 9 11:02:18 2011 New Revision: 820 Log: debian/patches/tools-libxl-prefix.diff, debian/patches/tools-xenpaging-prefix.diff: Set rpath. Modified: trunk/xen/debian/patches/tools-libxl-prefix.diff trunk/xen/debian/patches/tools-xenpaging-prefix.diff Modified: trunk/xen/debian/patches/tools-libxl-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-libxl-prefix.diff Wed Mar 9 11:01:35 2011 (r819) +++ trunk/xen/debian/patches/tools-libxl-prefix.diff Wed Mar 9 11:02:18 2011 (r820) @@ -1,5 +1,14 @@ --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile +@@ -15,7 +15,7 @@ + CFLAGS += -I. -fPIC + CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) + +-LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) ++LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) $(call LDFLAGS_RPATH,../lib) + + 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) @@ -90,18 +90,19 @@ .PHONY: install Modified: trunk/xen/debian/patches/tools-xenpaging-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-xenpaging-prefix.diff Wed Mar 9 11:01:35 2011 (r819) +++ trunk/xen/debian/patches/tools-xenpaging-prefix.diff Wed Mar 9 11:02:18 2011 (r820) @@ -1,5 +1,14 @@ --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile +@@ -4,7 +4,7 @@ + CFLAGS += -I $(XEN_XC) + CFLAGS += -I ./ + CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) +-LDFLAGS += $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) ++LDFLAGS += $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(call LDFLAGS_RPATH,../lib) + + POLICY = default + @@ -30,8 +30,8 @@ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^