From: Konrad Rzeszutek Wilk Date: Wed, 13 Jan 2016 03:16:11 +0000 (-0500) Subject: tools: fix python install with "xentoollog" X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1964 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7d3c16b4e966c3591d822e1ceb4431b63a723660;p=xen.git tools: fix python install with "xentoollog" commit 5d3dc8671521ea4a4f753e77d3e7fb3a3a6f5f80 "tools: Refactor "xentoollog" into its own library" with older python versions (2.6.4) will fail to the build if attempted to be done twice (which happens due to pygrub dependencies). make -C python DESTDIR=/tmp make -C python DESTDIR=/tmp The second one will fail with: error: -Wl, -rpath-link=../../tools/libs/toollog: No such file or directory even though the directory is there (with the libs). Andrew pointed out that the linker additions should be in the "extra_link_args" rather than "depends". And true enough - with that modification it builds. CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Boris Ostrovsky Suggested-by: Andrew Cooper Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell [ ijc -- typo in commit message ] --- diff --git a/tools/python/setup.py b/tools/python/setup.py index 9771cc4adb..604b314c41 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -17,7 +17,8 @@ xc = Extension("xc", include_dirs = [ PATH_XEN, PATH_LIBXENTOOLLOG + "/include", PATH_LIBXC + "/include", "xen/lowlevel/xc" ], library_dirs = [ PATH_LIBXC ], libraries = [ "xenctrl", "xenguest" ], - depends = [ PATH_LIBXC + "/libxenctrl.so", PATH_LIBXC + "/libxenguest.so", "-Wl,-rpath-link="+PATH_LIBXENTOOLLOG ], + depends = [ PATH_LIBXC + "/libxenctrl.so", PATH_LIBXC + "/libxenguest.so" ], + extra_link_args = [ "-Wl,-rpath-link="+PATH_LIBXENTOOLLOG ], sources = [ "xen/lowlevel/xc/xc.c" ]) xs = Extension("xs",