diff --git a/xen-glibc217.patch b/xen-glibc217.patch new file mode 100644 index 0000000..eb1fd0a --- /dev/null +++ b/xen-glibc217.patch @@ -0,0 +1,12 @@ +Index: xen-4.2.0-testing/tools/debugger/gdbsx/xg/xg_main.c +=================================================================== +--- xen-4.2.0-testing.orig/tools/debugger/gdbsx/xg/xg_main.c ++++ xen-4.2.0-testing/tools/debugger/gdbsx/xg/xg_main.c +@@ -34,6 +34,7 @@ + * XGTRC(): generic trace utility + */ + ++#include + #include + #include + #include diff --git a/xen.changes b/xen.changes index fd49818..2cbc3a6 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 17 10:51:05 UTC 2012 - aj@suse.de + +- Fix build with glibc 2.17: add patch xen-glibc217.patch, fix + configure for librt. + ------------------------------------------------------------------- Tue Oct 9 06:19:55 MDT 2012 - carnold@novell.com diff --git a/xen.spec b/xen.spec index 978191c..90a7e90 100644 --- a/xen.spec +++ b/xen.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xen ExclusiveArch: %ix86 x86_64 %define xvers 4.2 @@ -292,6 +293,7 @@ Patch457: xen-cpupool-xl-config-format.patch Patch458: ipxe-enable-nics.patch Patch459: blktap-close-fifos.patch Patch460: blktap-disable-debug-printf.patch +Patch461: xen-glibc217.patch # Jim's domain lock patch Patch480: xend-domain-lock.patch Patch481: xend-domain-lock-sfex.patch @@ -776,6 +778,7 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools %patch458 -p1 %patch459 -p1 %patch460 -p1 +%patch461 -p1 %patch480 -p1 %patch481 -p1 %patch500 -p1 @@ -798,6 +801,11 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools %patch700 -p1 %patch99998 -p1 %patch99999 -p1 +# tools/qemu-xen-traditional-dir-remote/configure ./tools/qemu-xen-dir-remote/configure use +# clock_gettime to check whether -lrt is needed - and don't check other functions +# with glibc 2.17 clock_gettime is part of libc, so use timer_settime +sed -i -e 's/int main(void) { clockid_t id; return clock_gettime(id, NULL); }/int main(void) { struct itimerspec v;timer_t t; return timer_gettime (t, \&v);}/' \ +tools/qemu-xen-traditional-dir-remote/configure ./tools/qemu-xen-dir-remote/configure %build XEN_EXTRAVERSION=%version-%release