Update to curl 7.61.1 - September 5 2018.
Bug: N/A
Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: Ic8598fc9d0bc029640ea3cbcecf4820d1de8f6ae
diff --git a/configure b/configure
index 74711b4..3d811ef 100755
--- a/configure
+++ b/configure
@@ -3329,6 +3329,11 @@
CURL_CFLAG_EXTRAS=""
if test X"$want_werror" = Xyes; then
CURL_CFLAG_EXTRAS="-Werror"
+ if test "$compiler_id" = "GNU_C"; then
+ if test "$compiler_num" -ge "500"; then
+ CURL_CFLAG_EXTRAS="$CURL_CFLAG_EXTRAS -pedantic-errors"
+ fi
+ fi
fi
@@ -17879,6 +17884,7 @@
#
if test "$compiler_num" -ge "295"; then
tmp_CFLAGS="$tmp_CFLAGS -Wno-long-long"
+ tmp_CFLAGS="$tmp_CFLAGS -Wbad-function-cast"
fi
#
if test "$compiler_num" -ge "296"; then
@@ -17901,6 +17907,7 @@
#
if test "$compiler_num" -ge "304"; then
tmp_CFLAGS="$tmp_CFLAGS -Wdeclaration-after-statement"
+ tmp_CFLAGS="$tmp_CFLAGS -Wold-style-definition"
fi
#
if test "$compiler_num" -ge "400"; then
@@ -17916,6 +17923,7 @@
tmp_CFLAGS="$tmp_CFLAGS -Wmissing-parameter-type -Wempty-body"
tmp_CFLAGS="$tmp_CFLAGS -Wclobbered -Wignored-qualifiers"
tmp_CFLAGS="$tmp_CFLAGS -Wconversion -Wno-sign-conversion -Wvla"
+ tmp_CFLAGS="$tmp_CFLAGS -ftree-vrp"
fi
#
if test "$compiler_num" -ge "405"; then
@@ -17928,11 +17936,20 @@
tmp_CFLAGS="$tmp_CFLAGS -Wdouble-promotion"
fi
#
+ if test "$compiler_num" -ge "408"; then
+ tmp_CFLAGS="$tmp_CFLAGS -Wformat=2"
+ fi
+ #
+ if test "$compiler_num" -ge "500"; then
+ tmp_CFLAGS="$tmp_CFLAGS -Warray-bounds=2"
+ fi
+ #
if test "$compiler_num" -ge "600"; then
tmp_CFLAGS="$tmp_CFLAGS -Wshift-negative-value"
tmp_CFLAGS="$tmp_CFLAGS -Wshift-overflow=2"
- tmp_CFLAGS="$tmp_CFLAGS -Wnull-dereference"
+ tmp_CFLAGS="$tmp_CFLAGS -Wnull-dereference -fdelete-null-pointer-checks"
tmp_CFLAGS="$tmp_CFLAGS -Wduplicated-cond"
+ tmp_CFLAGS="$tmp_CFLAGS -Wunused-const-variable"
fi
#
if test "$compiler_num" -ge "700"; then
@@ -17941,6 +17958,7 @@
tmp_CFLAGS="$tmp_CFLAGS -Walloc-zero"
tmp_CFLAGS="$tmp_CFLAGS -Wformat-overflow=2"
tmp_CFLAGS="$tmp_CFLAGS -Wformat-truncation=2"
+ tmp_CFLAGS="$tmp_CFLAGS -Wimplicit-fallthrough=4"
fi
#
fi
@@ -22551,7 +22569,10 @@
else
LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL"
- CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
+ if test "$PKGCONFIG" = "no" ; then
+ # only set this if pkg-config wasn't used
+ CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_Init_ex in -lcrypto" >&5
$as_echo_n "checking for HMAC_Init_ex in -lcrypto... " >&6; }
if ${ac_cv_lib_crypto_HMAC_Init_ex+:} false; then :
@@ -28442,7 +28463,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-main()
+int main()
{
return 0;
}