diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2018-09-14 09:04:03 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-17 08:39:22 +0100 |
| commit | 2aef37314d90ba5144b8f8c5d26190b687ddbbb3 (patch) | |
| tree | c5f9609a61d93fda7360a8e5b1dba7b929c6481f /meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | |
| parent | 6b0d5202002f76106ea33e4975c8ebef72a63fa1 (diff) | |
| download | openembedded-core-contrib-2aef37314d90ba5144b8f8c5d26190b687ddbbb3.tar.gz | |
xserver-xorg: upgrade 1.19.6 -> 1.20.1
removed included patch
Refresh 0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC
Remove 0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ -Discover monotonic clock using compile-time check +From 8a91316c4a38f20e7866289f3d779a037d27a129 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Mon, 12 Dec 2016 12:11:39 +0200 +Subject: [PATCH] Discover monotonic clock using compile-time check monotonic clock check does not work when cross-compiling. Upstream-Status: Denied [Does not work on OpenBSD] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> - - Original patch follows: 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 cross-compiling. Signed-off-by: David James <davidjames at google.com> + --- configure.ac | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac -index f7ab48c..26e85cd 100644 +index 2b21667..786e002 100644 --- a/configure.ac +++ b/configure.ac -@@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then +@@ -984,19 +984,16 @@ if ! test "x$have_clock_gettime" = xno; then CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" fi @@ -54,8 +56,5 @@ index f7ab48c..26e85cd 100644 - [MONOTONIC_CLOCK="cross compiling"]) +]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no]) - LIBS="$LIBS_SAVE" - CPPFLAGS="$CPPFLAGS_SAVE" --- -2.1.4 - + if test "$MONOTONIC_CLOCK" = "cross compiling"; then + AC_CHECK_DECL([CLOCK_MONOTONIC],[MONOTONIC_CLOCK="guessing yes"],[MONOTONIC_CLOCK=no],[#include <time.h>]) |