df3b0c42e6
Fix for bsc#1037779 - xen breaks kexec-tools build OBS-URL: https://build.opensuse.org/request/show/496869 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=81
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From: Bernhard Walle <bwalle@suse.de>
|
|
Subject: [PATCH] Link xenctrl statically
|
|
Upstream: no
|
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
|
|
|
This patch just links the xenctrl library statically. That allows
|
|
to use Xen support without a runtime dependency to the Xen package.
|
|
|
|
Signed-off-by: Bernhard Walle <bwalle@suse.de>
|
|
|
|
================================================================================
|
|
---
|
|
configure.ac | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
Index: kexec-tools-2.0.13/configure.ac
|
|
===================================================================
|
|
--- kexec-tools-2.0.13.orig/configure.ac
|
|
+++ kexec-tools-2.0.13/configure.ac
|
|
@@ -161,9 +161,24 @@ fi
|
|
|
|
dnl find Xen control stack libraries
|
|
if test "$with_xen" = yes ; then
|
|
+ if pkg-config --exists 'xenlight > 4.8.0' ; then
|
|
AC_CHECK_HEADER(xenctrl.h,
|
|
- [AC_CHECK_LIB(xenctrl, xc_kexec_load, ,
|
|
+ [AC_CHECK_LIB(xenctrl, xc_kexec_load,
|
|
+ [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoollog -lxendevicemodel -lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
|
|
AC_MSG_NOTICE([Xen support disabled]))])
|
|
+ else
|
|
+ if pkg-config --exists 'xenlight > 4.6.0' ; then
|
|
+ AC_CHECK_HEADER(xenctrl.h,
|
|
+ [AC_CHECK_LIB(xenctrl, xc_kexec_load,
|
|
+ [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoollog -lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
|
|
+ AC_MSG_NOTICE([Xen support disabled]))])
|
|
+ else
|
|
+ AC_CHECK_HEADER(xenctrl.h,
|
|
+ [AC_CHECK_LIB(xenctrl, xc_kexec_load,
|
|
+ [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
|
|
+ AC_MSG_NOTICE([Xen support disabled]))])
|
|
+ fi
|
|
+ fi
|
|
fi
|
|
|
|
dnl ---Sanity checks
|