diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-08-03 14:37:24 -0700 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-05 17:03:27 +0000 |
| commit | df6f538391a32781762288e9aac16aaa288e6957 (patch) | |
| tree | 4054c6f12e7527f32581ea0caa744412257800ab | |
| parent | 2c8d413510b7b7897f308873b78622395c891d27 (diff) | |
Bump minimum glibc requirement for sys/eventfd.h to glibc 2.8
The file was added to glibc 2.7 along with the functions we need (Added
2007-10-05). But they forgot to install the file until a month and a
half later (2007-11-17), which means it missed the 2.7 release
(2007-10-19).
Note that EFD_CLOEXEC wasn't added until glibc 2.9, so effectively glibc
2.9 is required.
Change-Id: I3868166e5efc45538544fffd14d773ba576fb793
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
(cherry picked from commit b22b5141404fe943e64ea7dad094097e8a0fd77d)
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/3rdparty/forkfd/forkfd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c index 7d2115abb6..720eb61b6d 100644 --- a/src/3rdparty/forkfd/forkfd.c +++ b/src/3rdparty/forkfd/forkfd.c @@ -47,10 +47,12 @@ #ifdef __linux__ # define HAVE_WAIT4 1 -# if defined(__BIONIC__) || (defined(__GLIBC__) && (__GLIBC__ << 8) + __GLIBC_MINOR__ >= 0x207 && \ +# if defined(__BIONIC__) || (defined(__GLIBC__) && (__GLIBC__ << 8) + __GLIBC_MINOR__ >= 0x208 && \ (!defined(__UCLIBC__) || ((__UCLIBC_MAJOR__ << 16) + (__UCLIBC_MINOR__ << 8) + __UCLIBC_SUBLEVEL__ > 0x90201))) # include <sys/eventfd.h> -# define HAVE_EVENTFD 1 +# ifdef EFD_CLOEXEC +# define HAVE_EVENTFD 1 +# endif # endif # if defined(__BIONIC__) || (defined(__GLIBC__) && (__GLIBC__ << 8) + __GLIBC_MINOR__ >= 0x209 && \ (!defined(__UCLIBC__) || ((__UCLIBC_MAJOR__ << 16) + (__UCLIBC_MINOR__ << 8) + __UCLIBC_SUBLEVEL__ > 0x90201))) |