mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Add configure --enable-rpath
This fixes the tools when xen is configured with --prefix=/odd/path Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> [ ijc -- ran autogen.sh as requested ]
This commit is contained in:
Olaf Hering authored and Ian Campbell committed
1 parent
0778774676
commit
4e41f61135
5 files changed
+46
-2
No files matched your search
@@ -208,6 +208,9 @@ LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i))
|
||||
CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
|
||||
LDFLAGS += $(foreach i, $(PREPEND_LIB), -L$(i))
|
||||
CFLAGS += $(foreach i, $(PREPEND_INCLUDES), -I$(i))
|
||||
ifeq ($(XEN_TOOLS_RPATH),y)
|
||||
LDFLAGS += -Wl,-rpath,$(LIBDIR)
|
||||
endif
|
||||
APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i))
|
||||
APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i))
|
||||
|
||||
|
||||
@@ -45,6 +45,7 @@ PTYFUNCS_LIBS := @PTYFUNCS_LIBS@
|
||||
|
||||
LIBNL3_LIBS := @LIBNL3_LIBS@
|
||||
LIBNL3_CFLAGS := @LIBNL3_CFLAGS@
|
||||
XEN_TOOLS_RPATH := @rpath@
|
||||
|
||||
# Download GIT repositories via HTTP or GIT's own protocol?
|
||||
# GIT's protocol is faster and more robust, when it works at all (firewalls
|
||||
|
||||
+14
-2
@@ -118,6 +118,14 @@ IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \
|
||||
--interp-prefix=$(CROSS_SYS_ROOT)
|
||||
endif
|
||||
|
||||
ifeq ($(XEN_TOOLS_RPATH),y)
|
||||
QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB):$(LIBDIR)
|
||||
IOEMU_EXTRA_LDFLAGS := --extra-ldflags="-Wl,-rpath,$(LIBDIR)"
|
||||
else
|
||||
QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB)
|
||||
IOEMU_EXTRA_LDFLAGS :=
|
||||
endif
|
||||
|
||||
QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo "$(QEMU_TRADITIONAL_LOC)"; else echo .; fi)
|
||||
ifneq ($(QEMU_ROOT),.)
|
||||
export QEMU_ROOT
|
||||
@@ -153,7 +161,10 @@ subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
|
||||
set -e; \
|
||||
$(buildmakevars2shellvars); \
|
||||
cd qemu-xen-traditional-dir; \
|
||||
$(QEMU_ROOT)/xen-setup --cpu=$(IOEMU_CPU_ARCH) $(IOEMU_CONFIGURE_CROSS); \
|
||||
$(QEMU_ROOT)/xen-setup \
|
||||
$(IOEMU_EXTRA_LDFLAGS) \
|
||||
--cpu=$(IOEMU_CPU_ARCH) \
|
||||
$(IOEMU_CONFIGURE_CROSS); \
|
||||
$(MAKE) all
|
||||
|
||||
subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
|
||||
@@ -162,6 +173,7 @@ subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
|
||||
cd qemu-xen-traditional-dir; \
|
||||
$(QEMU_ROOT)/xen-setup \
|
||||
--extra-cflags="$(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \
|
||||
$(IOEMU_EXTRA_LDFLAGS) \
|
||||
--cpu=$(IOEMU_CPU_ARCH) \
|
||||
$(IOEMU_CONFIGURE_CROSS); \
|
||||
$(MAKE) install
|
||||
@@ -206,7 +218,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
|
||||
$(EXTRA_CFLAGS_QEMU_XEN)" \
|
||||
--extra-ldflags="-L$(XEN_ROOT)/tools/libxc \
|
||||
-L$(XEN_ROOT)/tools/xenstore \
|
||||
-Wl,-rpath=$(PREFIX)/lib/xen/lib" \
|
||||
$(QEMU_UPSTREAM_RPATH)" \
|
||||
--bindir=$(LIBEXEC_BIN) \
|
||||
--datadir=$(SHAREDIR)/qemu-xen \
|
||||
--localstatedir=$(localstatedir) \
|
||||
|
||||
Vendored
+27
@@ -707,6 +707,7 @@ xsmpolicy
|
||||
ocamltools
|
||||
monitors
|
||||
githttp
|
||||
rpath
|
||||
XEN_PAGING_DIR
|
||||
XEN_LOCK_DIR
|
||||
XEN_SCRIPT_DIR
|
||||
@@ -779,6 +780,7 @@ ac_user_opts='
|
||||
enable_option_checking
|
||||
enable_largefile
|
||||
with_initddir
|
||||
enable_rpath
|
||||
enable_githttp
|
||||
enable_monitors
|
||||
enable_ocamltools
|
||||
@@ -1446,6 +1448,8 @@ Optional Features:
|
||||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||||
--disable-largefile omit support for large files
|
||||
--enable-rpath Build tools with -Wl,-rpath,LIBDIR (default is
|
||||
DISABLED)
|
||||
--enable-githttp Download GIT repositories via HTTP (default is
|
||||
DISABLED)
|
||||
--disable-monitors Disable xenstat and xentop monitoring tools (default
|
||||
@@ -3790,6 +3794,29 @@ XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
|
||||
|
||||
# Enable/disable options
|
||||
|
||||
# Check whether --enable-rpath was given.
|
||||
if test "${enable_rpath+set}" = set; then :
|
||||
enableval=$enable_rpath;
|
||||
fi
|
||||
|
||||
|
||||
if test "x$enable_rpath" = "xno"; then :
|
||||
|
||||
ax_cv_rpath="n"
|
||||
|
||||
elif test "x$enable_rpath" = "xyes"; then :
|
||||
|
||||
ax_cv_rpath="y"
|
||||
|
||||
elif test -z $ax_cv_rpath; then :
|
||||
|
||||
ax_cv_rpath="n"
|
||||
|
||||
fi
|
||||
rpath=$ax_cv_rpath
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-githttp was given.
|
||||
if test "${enable_githttp+set}" = set; then :
|
||||
enableval=$enable_githttp;
|
||||
|
||||
@@ -80,6 +80,7 @@ m4_include([../m4/systemd.m4])
|
||||
AX_XEN_EXPAND_CONFIG()
|
||||
|
||||
# Enable/disable options
|
||||
AX_ARG_DEFAULT_DISABLE([rpath], [Build tools with -Wl,-rpath,LIBDIR])
|
||||
AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP])
|
||||
AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools])
|
||||
AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools])
|
||||
|
||||