[Xen-changelog] [xen master] tools: fix python install with "xentoollog"

[patchbot@xxxxxxx]

commit 7d3c16b4e966c3591d822e1ceb4431b63a723660
Author:     Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
AuthorDate: Tue Jan 12 22:16:11 2016 -0500
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Jan 15 10:10:24 2016 +0000

    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 <ian.campbell@xxxxxxxxxx>
    CC: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    CC: Wei Liu <wei.liu2@xxxxxxxxxx>
    CC: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
    Suggested-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    [ ijc -- typo in commit message ]
---
 tools/python/setup.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tools/python/setup.py b/tools/python/setup.py
index 9771cc4..604b314 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",
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog