qemu-kvm/fix-librt-check.patch: Replace with fix from upstream qemu.git
This commit is contained in:
parent
8d245dc3d9
commit
0489661dd1
|
@ -1,17 +1,70 @@
|
||||||
diff -Naur qemu-kvm-1.2.0-orig/configure qemu-kvm-1.2.0/configure
|
commit 8bacde8d86a09699207d85d4bab06162aed18dc4
|
||||||
--- qemu-kvm-1.2.0-orig/configure 2012-09-06 04:31:27.000000000 -0400
|
Author: Natanael Copa <natanael.copa@gmail.com>
|
||||||
+++ qemu-kvm-1.2.0/configure 2013-02-15 11:04:45.923477251 -0500
|
Date: Wed Sep 12 09:06:51 2012 +0000
|
||||||
@@ -2682,13 +2682,14 @@
|
|
||||||
|
configure: properly check if -lrt and -lm is needed
|
||||||
|
|
||||||
|
Fixes build against uClibc.
|
||||||
|
|
||||||
|
uClibc provides 2 versions of clock_gettime(), one with realtime
|
||||||
|
support and one without (this is so you can avoid linking in -lrt
|
||||||
|
unless actually needed). This means that the clock_gettime() don't
|
||||||
|
need -lrt. We still need it for timer_create() so we check for this
|
||||||
|
function in addition.
|
||||||
|
|
||||||
|
We also need check if -lm is needed for isnan().
|
||||||
|
|
||||||
|
Both -lm and -lrt are needed for libs_qga.
|
||||||
|
|
||||||
|
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
|
||||||
|
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index 7656c32..9ab13db 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -2671,17 +2671,44 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
##########################################
|
||||||
|
+# Do we need libm
|
||||||
|
+cat > $TMPC << EOF
|
||||||
|
+#include <math.h>
|
||||||
|
+int main(void) { return isnan(sin(0.0)); }
|
||||||
|
+EOF
|
||||||
|
+if compile_prog "" "" ; then
|
||||||
|
+ :
|
||||||
|
+elif compile_prog "" "-lm" ; then
|
||||||
|
+ LIBS="-lm $LIBS"
|
||||||
|
+ libs_qga="-lm $libs_qga"
|
||||||
|
+else
|
||||||
|
+ echo
|
||||||
|
+ echo "Error: libm check failed"
|
||||||
|
+ echo
|
||||||
|
+ exit 1
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+##########################################
|
||||||
|
# Do we need librt
|
||||||
|
+# uClibc provides 2 versions of clock_gettime(), one with realtime
|
||||||
|
+# support and one without. This means that the clock_gettime() don't
|
||||||
|
+# need -lrt. We still need it for timer_create() so we check for this
|
||||||
|
+# function in addition.
|
||||||
cat > $TMPC <<EOF
|
cat > $TMPC <<EOF
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
-int main(void) { return clock_gettime(CLOCK_REALTIME, NULL); }
|
-int main(void) { return clock_gettime(CLOCK_REALTIME, NULL); }
|
||||||
+int main(void) { return timer_gettime(CLOCK_REALTIME, NULL); }
|
+int main(void) {
|
||||||
|
+ timer_create(CLOCK_REALTIME, NULL, NULL);
|
||||||
|
+ return clock_gettime(CLOCK_REALTIME, NULL);
|
||||||
|
+}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if compile_prog "" "" ; then
|
if compile_prog "" "" ; then
|
||||||
:
|
:
|
||||||
elif compile_prog "" "-lrt" ; then
|
-elif compile_prog "" "-lrt" ; then
|
||||||
|
+# we need pthread for static linking. use previous pthread test result
|
||||||
|
+elif compile_prog "" "-lrt $pthread_lib" ; then
|
||||||
LIBS="-lrt $LIBS"
|
LIBS="-lrt $LIBS"
|
||||||
+ libs_qga="-lrt $libs_qga"
|
+ libs_qga="-lrt $libs_qga"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue