|
@@ -0,0 +1,48 @@
|
|
|
+From 07662af7aed55bcec448bc2a6610de1f0cb62100 Mon Sep 17 00:00:00 2001
|
|
|
+From: Andrei Borzenkov <arvidjaar@gmail.com>
|
|
|
+Date: Thu, 22 Dec 2016 22:48:25 +0300
|
|
|
+Subject: [PATCH] configure: fix check for sys/sysmacros.h under glibc 2.25+
|
|
|
+
|
|
|
+glibc 2.25 still includes sys/sysmacros.h in sys/types.h but also emits
|
|
|
+deprecation warning. So test for sys/types.h succeeds in configure but later
|
|
|
+compilation fails because we use -Werror by default.
|
|
|
+
|
|
|
+While this is fixed in current autoconf GIT, we really cannot force everyone
|
|
|
+to use bleeding edge (that is not even released right now). So run test under
|
|
|
+-Werror as well to force proper detection.
|
|
|
+
|
|
|
+This should have no impact on autoconf 2.70+ as AC_HEADER_MAJOR in this version
|
|
|
+simply checks for header existence.
|
|
|
+
|
|
|
+Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/grub.git/commit/?id=07662af7aed55bcec448bc2a6610de1f0cb62100]
|
|
|
+
|
|
|
+Reported and tested by Khem Raj <raj.khem@gmail.com>
|
|
|
+
|
|
|
+Signed-off-by: Andrei Borzenkov <arvidjaar@gmail.com>
|
|
|
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
|
|
|
+---
|
|
|
+ configure.ac | 7 +++++++
|
|
|
+ 1 file changed, 7 insertions(+)
|
|
|
+
|
|
|
+diff --git a/configure.ac b/configure.ac
|
|
|
+index dc56564..4e980c5 100644
|
|
|
+--- a/configure.ac
|
|
|
++++ b/configure.ac
|
|
|
+@@ -389,7 +389,14 @@ fi
|
|
|
+ # Check for functions and headers.
|
|
|
+ AC_CHECK_FUNCS(posix_memalign memalign getextmntent)
|
|
|
+ AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h limits.h)
|
|
|
++
|
|
|
++# glibc 2.25 still includes sys/sysmacros.h in sys/types.h but emits deprecation
|
|
|
++# warning which causes compilation failure later with -Werror. So use -Werror here
|
|
|
++# as well to force proper sys/sysmacros.h detection.
|
|
|
++SAVED_CFLAGS="$CFLAGS"
|
|
|
++CFLAGS="$HOST_CFLAGS -Werror"
|
|
|
+ AC_HEADER_MAJOR
|
|
|
++CFLAGS="$SAVED_CFLAGS"
|
|
|
+
|
|
|
+ AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$ac_includes_default
|
|
|
+ #include <sys/param.h>
|
|
|
+--
|
|
|
+2.4.0
|
|
|
+
|