diff options
| author | Eric Engestrom <eric.engestrom@imgtec.com> | 2018-03-21 17:04:06 +0000 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@imgtec.com> | 2018-03-23 11:44:21 +0000 |
| commit | cbee1bfb34274668a05995b9d4c78ddec9e5ea4c (patch) | |
| tree | dad1c9037de2c77cc57dd5c5c531169f7174798b | |
| parent | ee2b943fa85755fe2565f12c625e41cd08a826f9 (diff) | |
| download | mesa-cbee1bfb34274668a05995b9d4c78ddec9e5ea4c.tar.gz | |
meson/configure: detect endian.h instead of trying to guess when it's available
Cc: Maxin B. John <maxin.john@gmail.com>
Cc: Khem Raj <raj.khem@gmail.com>
Cc: Rob Herring <robh@kernel.org>
Suggested-by: Jon Turney <jon.turney@dronecode.org.uk>
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Cc: <mesa-stable@lists.freedesktop.org>
| -rw-r--r-- | Android.common.mk | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rwxr-xr-x | scons/gallium.py | 3 | ||||
| -rw-r--r-- | src/util/u_endian.h | 2 |
5 files changed, 7 insertions, 2 deletions
diff --git a/Android.common.mk b/Android.common.mk index 52dc7bff3be..e8aed48c31a 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -70,6 +70,7 @@ LOCAL_CFLAGS += \ -DHAVE_DLADDR \ -DHAVE_DL_ITERATE_PHDR \ -DHAVE_LINUX_FUTEX_H \ + -DHAVE_ENDIAN_H \ -DHAVE_ZLIB \ -DMAJOR_IN_SYSMACROS \ -fvisibility=hidden \ diff --git a/configure.ac b/configure.ac index 29d3c3457a7..36c56da787e 100644 --- a/configure.ac +++ b/configure.ac @@ -865,6 +865,7 @@ fi AC_HEADER_MAJOR AC_CHECK_HEADER([xlocale.h], [DEFINES="$DEFINES -DHAVE_XLOCALE_H"]) AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"]) +AC_CHECK_HEADER([endian.h], [DEFINES="$DEFINES -DHAVE_ENDIAN_H"]) AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"]) AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"]) AC_CHECK_FUNC([timespec_get], [DEFINES="$DEFINES -DHAVE_TIMESPEC_GET"]) diff --git a/meson.build b/meson.build index 871b0d8d22f..041d2bfc70d 100644 --- a/meson.build +++ b/meson.build @@ -916,7 +916,7 @@ elif cc.has_header_symbol('sys/mkdev.h', 'major') pre_args += '-DMAJOR_IN_MKDEV' endif -foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h'] +foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h'] if cc.compiles('#include <@0@>'.format(h), name : '@0@ works'.format(h)) pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify()) endif diff --git a/scons/gallium.py b/scons/gallium.py index 75200b89c1f..6cb20efcbf4 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -354,6 +354,9 @@ def generate(env): if check_header(env, 'xlocale.h'): cppdefines += ['HAVE_XLOCALE_H'] + if check_header(env, 'endian.h'): + cppdefines += ['HAVE_ENDIAN_H'] + if check_functions(env, ['strtod_l', 'strtof_l']): cppdefines += ['HAVE_STRTOD_L'] diff --git a/src/util/u_endian.h b/src/util/u_endian.h index 22d011ec008..e11b381588d 100644 --- a/src/util/u_endian.h +++ b/src/util/u_endian.h @@ -27,7 +27,7 @@ #ifndef U_ENDIAN_H #define U_ENDIAN_H -#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__) +#ifdef HAVE_ENDIAN_H #include <endian.h> #if __BYTE_ORDER == __LITTLE_ENDIAN |