From 9196e26517f61155555e11fe432551c13695df90 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 22 Feb 2019 12:24:35 +0000 Subject: [PATCH] pygrub: Specify -rpath LIBEXEC_LIB when building fsimage.so If LIBEXEC_LIB is not on the default linker search path, the python fsimage.so module fails to find libfsimage.so. Add the relevant directory to the rpath explicitly. (This situation occurs in the Debian package, where --with-libexec-libdir is used to put each Xen version's libraries and utilities in their own directory, to allow them to be coinstalled.) Signed-off-by: Ian Jackson --- tools/pygrub/Makefile | 5 +++-- tools/pygrub/setup.py | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile index 3063c4998f..4cd1a95421 100644 --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile @@ -10,12 +10,13 @@ INSTALL_LOG = build/installed_files.txt all: build .PHONY: build build: - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build + CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" LIBEXEC_LIB=$(LIBEXEC_LIB) $(PYTHON) setup.py build .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)/$(bindir) - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \ + CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" \ + LIBEXEC_LIB=$(LIBEXEC_LIB) $(PYTHON) \ setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \ diff --git a/tools/pygrub/setup.py b/tools/pygrub/setup.py index b8f1dc4590..91019e97e7 100644 --- a/tools/pygrub/setup.py +++ b/tools/pygrub/setup.py @@ -5,10 +5,15 @@ import sys extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] +extra_link_args = [] +try: extra_link_args += [ "-Wl,-rpath," + os.environ['LIBEXEC_LIB'] ] +except KeyError: pass + XEN_ROOT = "../.." xenfsimage = Extension("xenfsimage", 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 = ["xenfsimage"], -- 2.30.2