Accepting request 141639 from Virtualization

Fix build  with glibc 2.17 (forwarded request 141624 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/141639
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=164
This commit is contained in:
Stephan Kulow 2012-11-21 16:23:50 +00:00 committed by Git OBS Bridge
commit 09c6ccd2c1
3 changed files with 26 additions and 0 deletions

12
xen-glibc217.patch Normal file
View File

@ -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 <sys/types.h>
#include <stdio.h>
#include <stddef.h>
#include <stdarg.h>

View File

@ -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

View File

@ -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