|
@@ -0,0 +1,65 @@
|
|
|
+From 8497f7ed38146378a988bc22800b3a5eba38b0fd Mon Sep 17 00:00:00 2001
|
|
|
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
+Date: Mon, 13 Jun 2022 16:29:38 +0200
|
|
|
+Subject: [PATCH] configure.ac: add --disable-werror
|
|
|
+
|
|
|
+Allow the user to disable -Werror to avoid the following build failure:
|
|
|
+
|
|
|
+In file included from hash.c:7:
|
|
|
+xxhash.h:2667:5: error: #warning is a GCC extension [-Werror]
|
|
|
+ 2667 | # warning "XXH3 is highly inefficient without ARM or Thumb-2."
|
|
|
+ | ^~~~~~~
|
|
|
+xxhash.h:2667:5: error: #warning "XXH3 is highly inefficient without ARM or Thumb-2." [-Werror=cpp]
|
|
|
+
|
|
|
+Fixes:
|
|
|
+ - http://autobuild.buildroot.org/results/3124bae73c207f1a118e57e41e222ef464ccb297
|
|
|
+
|
|
|
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
+[Upstream status: https://github.com/memcached/memcached/pull/926]
|
|
|
+---
|
|
|
+ configure.ac | 11 +++++++++--
|
|
|
+ 1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
+
|
|
|
+diff --git a/configure.ac b/configure.ac
|
|
|
+index 3337fe7..7683b8f 100644
|
|
|
+--- a/configure.ac
|
|
|
++++ b/configure.ac
|
|
|
+@@ -114,6 +114,9 @@ AC_ARG_ENABLE(static,
|
|
|
+ AC_ARG_ENABLE(unix_socket,
|
|
|
+ [AS_HELP_STRING([--disable-unix-socket], [Disable unix domain socket])])
|
|
|
+
|
|
|
++AC_ARG_ENABLE(werror,
|
|
|
++ [AS_HELP_STRING([--disable-werror], [Disable -Werror])])
|
|
|
++
|
|
|
+ dnl **********************************************************************
|
|
|
+ dnl DETECT_SASL_CB_GETCONF
|
|
|
+ dnl
|
|
|
+@@ -783,6 +786,10 @@ AM_CONDITIONAL([BUILD_SPECIFICATIONS],
|
|
|
+ [test "x$enable_docs" != "xno" -a "x$XML2RFC" != "xno" -a "x$XSLTPROC" != "xno"])
|
|
|
+
|
|
|
+
|
|
|
++if test "x$enable_werror" != "xno"; then
|
|
|
++ CFLAGS="$CFLAGS -Werror"
|
|
|
++fi
|
|
|
++
|
|
|
+ dnl Let the compiler be a bit more picky. Please note that you cannot
|
|
|
+ dnl specify these flags to the compiler before AC_CHECK_FUNCS, because
|
|
|
+ dnl the test program will generate a compilation warning and hence fail
|
|
|
+@@ -790,12 +797,12 @@ dnl to detect the function ;-)
|
|
|
+ if test "$ICC" = "yes"
|
|
|
+ then
|
|
|
+ dnl ICC trying to be gcc.
|
|
|
+- CFLAGS="$CFLAGS -diag-disable 187 -Wall -Werror"
|
|
|
++ CFLAGS="$CFLAGS -diag-disable 187 -Wall"
|
|
|
+ AC_DEFINE([_GNU_SOURCE],[1],[make sure IOV_MAX is defined])
|
|
|
+ elif test "$GCC" = "yes"
|
|
|
+ then
|
|
|
+ GCC_VERSION=`$CC -dumpversion`
|
|
|
+- CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
|
|
|
++ CFLAGS="$CFLAGS -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
|
|
|
+ if test "x$enable_asan" = "xyes"; then
|
|
|
+ CFLAGS="$CFLAGS -fsanitize=address"
|
|
|
+ fi
|
|
|
+--
|
|
|
+2.35.1
|
|
|
+
|