Author: waldi
Date: Mon May 12 13:49:52 2008
New Revision: 557
Log:
debian/patches: Backport rpath setting from xen-unstable.
Removed:
trunk/xen-3/debian/patches/tools-ldflags.diff
Modified:
trunk/xen-3/debian/patches/series
trunk/xen-3/debian/patches/tools-ioemu-arch.diff
trunk/xen-3/debian/patches/tools-lib-abiname.diff
trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff
trunk/xen-3/debian/patches/tools-misc-xend-race.diff
trunk/xen-3/debian/patches/tools-prefix.diff
trunk/xen-3/debian/patches/tools-pygrub-prefix.diff
trunk/xen-3/debian/patches/tools-rpath.diff
Modified: trunk/xen-3/debian/patches/series
=============================================================================---
trunk/xen-3/debian/patches/series (original)
+++ trunk/xen-3/debian/patches/series Mon May 12 13:49:52 2008
@@ -3,7 +3,6 @@
tools-prefix.diff
tools-misc-prefix.diff
tools-python-prefix.diff
-tools-ldflags.diff
version.patch
tools-lib-abiname.diff
tools-python-xen-xm-relative-path.diff
Modified: trunk/xen-3/debian/patches/tools-ioemu-arch.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-ioemu-arch.diff (original)
+++ trunk/xen-3/debian/patches/tools-ioemu-arch.diff Mon May 12 13:49:52 2008
@@ -1,6 +1,6 @@
--- xen-3.orig/tools/ioemu/configure
+++ xen-3/tools/ioemu/configure
-@@ -27,46 +27,18 @@
+@@ -29,46 +29,18 @@
make="make"
install="install"
strip="strip"
@@ -55,7 +55,7 @@
;;
--- xen-3.orig/tools/Makefile
+++ xen-3/tools/Makefile
-@@ -67,7 +67,7 @@
+@@ -68,7 +68,7 @@
export IOEMU_DIR ?= ioemu
ioemu ioemuinstall:
[ -f $(IOEMU_DIR)/config-host.mak ] || \
Modified: trunk/xen-3/debian/patches/tools-lib-abiname.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-lib-abiname.diff (original)
+++ trunk/xen-3/debian/patches/tools-lib-abiname.diff Mon May 12 13:49:52 2008
@@ -52,9 +52,9 @@
- ln -sf $< $@
-
-libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $^ -lpthread
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR)
$(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^ -lpthread
+libxenctrl.so: $(CTRL_PIC_OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lpthread
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^
-lpthread
# libxenguest
@@ -67,9 +67,9 @@
- ln -sf $< $@
-
-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 -lpthread
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR)
$(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl
-lpthread
+libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz
-lxenctrl -lpthread
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@
$(GUEST_PIC_OBJS) -lz -lxenctrl -lpthread
-include $(DEPS)
@@ -86,7 +86,7 @@
BLKTAP_INSTALL_DIR = /usr/$(BINDIR)
-@@ -28,35 +26,30 @@
+@@ -29,35 +27,30 @@
OBJS = $(patsubst %.c,%.o,$(SRCS))
IBINS :
@@ -119,7 +119,7 @@
- $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
+libblktap.so: $(OBJS)
+ $(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
- -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore
\
+ -L$(XEN_XENSTORE) -l xenstore \
- -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
- ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
- ln -sf libblktap.so.$(MAJOR) libblktap.so
Modified: trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff (original)
+++ trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff Mon May 12 13:49:52
2008
@@ -1,6 +1,6 @@
--- xen-3.orig/tools/libfsimage/Rules.mk
+++ xen-3/tools/libfsimage/Rules.mk
-@@ -7,11 +7,7 @@
+@@ -8,11 +8,7 @@
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
Modified: trunk/xen-3/debian/patches/tools-misc-xend-race.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-misc-xend-race.diff (original)
+++ trunk/xen-3/debian/patches/tools-misc-xend-race.diff Mon May 12 13:49:52
2008
@@ -2,7 +2,7 @@
--- xen-3.orig/tools/misc/xend
+++ xen-3/tools/misc/xend
-@@ -78,6 +78,8 @@
+@@ -97,6 +97,8 @@
execute(''xenstored'', args)
def start_consoled():
Modified: trunk/xen-3/debian/patches/tools-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-prefix.diff (original)
+++ trunk/xen-3/debian/patches/tools-prefix.diff Mon May 12 13:49:52 2008
@@ -10,7 +10,7 @@
CFLAGS += -Werror
@@ -52,6 +52,7 @@
- $(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
+ $(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
install: all
+ $(INSTALL_DIR) $(DESTDIR)$(INST_DIR)
@@ -29,7 +29,7 @@
CFLAGS += -Werror
-@@ -30,7 +29,5 @@
+@@ -31,7 +30,5 @@
.PHONY: install
install: $(BIN)
@@ -121,7 +121,7 @@
CFLAGS += -Werror
CFLAGS += -I $(XEN_XC)
CFLAGS += -I $(XEN_LIBXC)
-@@ -31,10 +29,8 @@
+@@ -32,10 +30,8 @@
.PHONY: install
install: build
@@ -144,7 +144,7 @@
CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
LDFLAGS += -L$(XEN_LIBXENSTAT)
-@@ -33,7 +32,7 @@
+@@ -34,7 +33,7 @@
.PHONY: install
install: xentop xentop.1
@@ -185,7 +185,7 @@
--- xen-3.orig/tools/xentrace/Makefile
+++ xen-3/tools/xentrace/Makefile
-@@ -35,15 +35,11 @@
+@@ -36,15 +36,11 @@
.PHONY: install
install: build
Modified: trunk/xen-3/debian/patches/tools-pygrub-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-pygrub-prefix.diff (original)
+++ trunk/xen-3/debian/patches/tools-pygrub-prefix.diff Mon May 12 13:49:52 2008
@@ -27,19 +27,3 @@
import fsimage
import grub.GrubConf
---- xen-3.orig/tools/pygrub/setup.py
-+++ xen-3/tools/pygrub/setup.py
-@@ -4,11 +4,13 @@
- import sys
-
- extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
-+extra_link_args = [ "-Wl,-rpath,/usr/%s" %
os.environ[''LIBDIR''] ]
-
- XEN_ROOT = "../.."
-
- fsimage = Extension("fsimage",
- extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
- include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
- library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
- libraries = ["fsimage"],
Modified: trunk/xen-3/debian/patches/tools-rpath.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-rpath.diff (original)
+++ trunk/xen-3/debian/patches/tools-rpath.diff Mon May 12 13:49:52 2008
@@ -1,22 +1,21 @@
--- xen-3.orig/tools/Rules.mk
+++ xen-3/tools/Rules.mk
-@@ -10,6 +10,9 @@
- XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
- XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
+@@ -5,6 +5,8 @@
-+RPATH_ARG := -Wl,-rpath,/usr/$(LIBDIR)
-+LDFLAGS += $(RPATH_ARG)
-+
- X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
+ include $(XEN_ROOT)/Config.mk
- CFLAGS += -D__XEN_TOOLS__
++LDFLAGS_RPATH = -Wl,-rpath,''$${ORIGIN}$(if $(1),/$(1))''
++
+ XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
+ XEN_LIBXC = $(XEN_ROOT)/tools/libxc
+ XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
--- xen-3.orig/tools/python/setup.py
+++ xen-3/tools/python/setup.py
@@ -5,6 +5,7 @@
XEN_ROOT = "../.."
extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
-+extra_link_args = [ "-Wl,-rpath,/usr/%s" %
os.environ[''LIBDIR''] ]
++extra_link_args = [ "-Wl,-rpath,${ORIGIN}/../../.." ]
include_dirs = [ XEN_ROOT + "/tools/libxc",
XEN_ROOT + "/tools/xenstore",
@@ -68,36 +67,173 @@
include_dirs = include_dirs + [ "ptsname" ],
library_dirs = library_dirs,
libraries = libraries,
---- xen-3.orig/tools/blktap/drivers/Makefile
-+++ xen-3/tools/blktap/drivers/Makefile
-@@ -49,7 +49,7 @@
- qcow-util: img2qcow qcow2raw qcow-create
-
- img2qcow qcow2raw qcow-create: %: $(BLK-OBJS)
-- $(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
-+ $(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
+--- xen-3.orig/tools/ioemu/Makefile.target
++++ xen-3/tools/ioemu/Makefile.target
+@@ -506,6 +506,8 @@
+ VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc64.ld
+ endif
- install: all
- $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
---- xen-3.orig/tools/blktap/lib/Makefile
-+++ xen-3/tools/blktap/lib/Makefile
-@@ -52,7 +52,7 @@
++VL_LDFLAGS+=$(call LDFLAGS_RPATH,../lib)
++
+ ifdef CONFIG_WIN32
+ SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
+ endif
+--- xen-3.orig/tools/libxc/Makefile
++++ xen-3/tools/libxc/Makefile
+@@ -149,7 +149,7 @@
+ ln -sf $< $@
+
+ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR)
$(SHLIB_CFLAGS) -o $@ $^ -lpthread
++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR)
$(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^ -lpthread
+
+ # libxenguest
+
+@@ -162,7 +162,7 @@
+ ln -sf $< $@
+
+ 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 -lpthread
++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR)
$(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl
-lpthread
+
+ -include $(DEPS)
+
+--- xen-3.orig/tools/xcutils/Makefile
++++ xen-3/tools/xcutils/Makefile
+@@ -24,7 +24,7 @@
+
+ PROGRAMS = xc_restore xc_save readnotes
+
+-LDLIBS = -L$(XEN_LIBXC) -L$(XEN_XENSTORE) -lxenguest -lxenctrl -lxenstore
++LDLIBS = -L$(XEN_LIBXC) -L$(XEN_XENSTORE) -lxenguest -lxenctrl -lxenstore
$(call LDFLAGS_RPATH,../lib)
+
+ .PHONY: all
+ all: build
+--- xen-3.orig/tools/xenstat/xentop/Makefile
++++ xen-3/tools/xenstat/xentop/Makefile
+@@ -25,6 +25,7 @@
+
+ CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
+ LDFLAGS += -L$(XEN_LIBXENSTAT)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+ LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
+ CFLAGS += -DHOST_$(XEN_OS)
+
+--- xen-3.orig/tools/misc/Makefile
++++ xen-3/tools/misc/Makefile
+@@ -44,4 +44,4 @@
+ $(CC) -c $(CFLAGS) -o $@ $<
- libblktap.a: $(OBJS)
- $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
-- -L$(XEN_XENSTORE) -l xenstore \
-+ -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore
\
- -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
- ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
- ln -sf libblktap.so.$(MAJOR) libblktap.so
+ xenperf: %: %.o Makefile
+- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
++ $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl $(call
LDFLAGS_RPATH,../lib)
--- xen-3.orig/tools/xentrace/Makefile
+++ xen-3/tools/xentrace/Makefile
-@@ -52,6 +52,6 @@
+@@ -5,6 +5,7 @@
+
+ CFLAGS += -I $(XEN_XC)
+ CFLAGS += -I $(XEN_LIBXC)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+
+ HDRS = $(wildcard *.h)
+ OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
+@@ -52,6 +53,6 @@
$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
%: %.c $(HDRS) Makefile
- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
-+ $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
++ $(CC) $(CFLAGS) -o $@ $< $(call LDFLAGS_RPATH,../lib) -L$(XEN_LIBXC)
-lxenctrl
xentrace_%: %.c $(HDRS) Makefile
- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
-+ $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
++ $(CC) $(CFLAGS) -o $@ $< $(call LDFLAGS_RPATH,../lib) -L$(XEN_LIBXC)
-lxenctrl
+--- xen-3.orig/tools/console/Makefile
++++ xen-3/tools/console/Makefile
+@@ -9,6 +9,7 @@
+
+ CFLAGS += -I $(XEN_LIBXC)
+ CFLAGS += -I $(XEN_XENSTORE)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+
+ BIN = xenconsoled xenconsole
+
+@@ -21,11 +22,11 @@
+ $(RM) client/*.o daemon/*.o
+
+ xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
+- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
++ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
+ $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
+
+ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
+- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
++ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
+ $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
+
+ .PHONY: install
+--- xen-3.orig/tools/xenmon/Makefile
++++ xen-3/tools/xenmon/Makefile
+@@ -19,6 +19,7 @@
+ CFLAGS += -I $(XEN_XC)
+ CFLAGS += -I $(XEN_LIBXC)
+ LDFLAGS += -L $(XEN_LIBXC)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+
+ BIN = xentrace_setmask xenbaked
+ SCRIPTS = xenmon.py
+--- xen-3.orig/tools/libfsimage/Rules.mk
++++ xen-3/tools/libfsimage/Rules.mk
+@@ -4,6 +4,7 @@
+
+ CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -Wp,-MD,.$(@F).d
+ LDFLAGS += -L../common/
++LDFLAGS += $(call LDFLAGS_RPATH,../../)
+
+ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
+
+--- xen-3.orig/tools/pygrub/setup.py
++++ xen-3/tools/pygrub/setup.py
+@@ -4,11 +4,13 @@
+ import sys
+
+ extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
++extra_link_args = [ "-Wl,-rpath,${ORIGIN}/.." ]
+
+ XEN_ROOT = "../.."
+
+ fsimage = Extension("fsimage",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+ library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+ libraries = ["fsimage"],
+--- xen-3.orig/tools/blktap/lib/Makefile
++++ xen-3/tools/blktap/lib/Makefile
+@@ -10,6 +10,7 @@
+ INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
+
+ LIBS := -lz
++LIBS += $(call LDFLAGS_RPATH)
+
+ SRCS :+ SRCS += xenbus.c blkif.c xs_api.c
+--- xen-3.orig/tools/blktap/drivers/Makefile
++++ xen-3/tools/blktap/drivers/Makefile
+@@ -25,6 +25,7 @@
+ LIBS += -lcrypto
+ LIBS += -lz
+ LIBS += -L$(XEN_XENSTORE) -lxenstore
++LIBS += $(call LDFLAGS_RPATH,../lib)
+
+ AIOLIBS := $(LIBAIO_DIR)/libaio.a
+
+--- xen-3.orig/tools/xenstore/Makefile
++++ xen-3/tools/xenstore/Makefile
+@@ -33,7 +33,7 @@
+ all: libxenstore.so libxenstore.a xenstored $(CLIENTS) xs_tdb_dump
xenstore-control xenstore-ls
+
+ xenstored: $(XENSTORED_OBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl $(SOCKET_LIBS)
-o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) $(call
LDFLAGS_RPATH,../lib) -lxenctrl $(SOCKET_LIBS) -o $@
+
+ $(CLIENTS): xenstore-%: xenstore_%.o libxenstore.so
+ $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore
$(SOCKET_LIBS) -o $@