diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch index 16ec3edb3b..020a1cf37c 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | |||
@@ -1,12 +1,13 @@ | |||
1 | Discover monotonic clock using compile-time check | 1 | From 8a91316c4a38f20e7866289f3d779a037d27a129 Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Mon, 12 Dec 2016 12:11:39 +0200 | ||
4 | Subject: [PATCH] Discover monotonic clock using compile-time check | ||
2 | 5 | ||
3 | monotonic clock check does not work when cross-compiling. | 6 | monotonic clock check does not work when cross-compiling. |
4 | 7 | ||
5 | Upstream-Status: Denied [Does not work on OpenBSD] | 8 | Upstream-Status: Denied [Does not work on OpenBSD] |
6 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
7 | 10 | ||
8 | |||
9 | |||
10 | Original patch follows: | 11 | Original patch follows: |
11 | 12 | ||
12 | When xorg-xserver is being cross-compiled, there is currently no way | 13 | When xorg-xserver is being cross-compiled, there is currently no way |
@@ -21,15 +22,16 @@ monotonic clock is available. This check can run just fine when we are | |||
21 | cross-compiling. | 22 | cross-compiling. |
22 | 23 | ||
23 | Signed-off-by: David James <davidjames at google.com> | 24 | Signed-off-by: David James <davidjames at google.com> |
25 | |||
24 | --- | 26 | --- |
25 | configure.ac | 17 +++++++---------- | 27 | configure.ac | 17 +++++++---------- |
26 | 1 file changed, 7 insertions(+), 10 deletions(-) | 28 | 1 file changed, 7 insertions(+), 10 deletions(-) |
27 | 29 | ||
28 | diff --git a/configure.ac b/configure.ac | 30 | diff --git a/configure.ac b/configure.ac |
29 | index f7ab48c..26e85cd 100644 | 31 | index 2b21667..786e002 100644 |
30 | --- a/configure.ac | 32 | --- a/configure.ac |
31 | +++ b/configure.ac | 33 | +++ b/configure.ac |
32 | @@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then | 34 | @@ -984,19 +984,16 @@ if ! test "x$have_clock_gettime" = xno; then |
33 | CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" | 35 | CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" |
34 | fi | 36 | fi |
35 | 37 | ||
@@ -54,8 +56,5 @@ index f7ab48c..26e85cd 100644 | |||
54 | - [MONOTONIC_CLOCK="cross compiling"]) | 56 | - [MONOTONIC_CLOCK="cross compiling"]) |
55 | +]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no]) | 57 | +]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no]) |
56 | 58 | ||
57 | LIBS="$LIBS_SAVE" | 59 | if test "$MONOTONIC_CLOCK" = "cross compiling"; then |
58 | CPPFLAGS="$CPPFLAGS_SAVE" | 60 | AC_CHECK_DECL([CLOCK_MONOTONIC],[MONOTONIC_CLOCK="guessing yes"],[MONOTONIC_CLOCK=no],[#include <time.h>]) |
59 | -- | ||
60 | 2.1.4 | ||
61 | |||