From 90e3b8d1a9841fc0c1cfdebbdb643580db348b37 Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Wed, 24 Mar 2021 15:34:26 +0100 Subject: [PATCH] - Travis, fix warning in ubsan compile. - Fix configure Targetconfiditionals.h header check, to use compile. --- .travis.yml | 2 +- configure | 3 ++- configure.ac | 2 +- doc/Changelog | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2fc6c19f..1f514b5d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -327,7 +327,7 @@ script: - | export MAKE_TEST="yes" if [ "$TEST_UBSAN" = "yes" ]; then - export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=undefined -fno-sanitize-recover" + export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=undefined -fno-sanitize-recover=all" elif [ "$TEST_ASAN" = "yes" ]; then export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=address" fi diff --git a/configure b/configure index ab4be4f36..40a0d4e00 100755 --- a/configure +++ b/configure @@ -14793,7 +14793,8 @@ done # Check for Apple header. This uncovers TARGET_OS_IPHONE, TARGET_OS_TV or TARGET_OS_WATCH for ac_header in TargetConditionals.h do : - ac_fn_c_check_header_mongrel "$LINENO" "TargetConditionals.h" "ac_cv_header_TargetConditionals_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "TargetConditionals.h" "ac_cv_header_TargetConditionals_h" "$ac_includes_default +" if test "x$ac_cv_header_TargetConditionals_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_TARGETCONDITIONALS_H 1 diff --git a/configure.ac b/configure.ac index f38f3a9fd..439f1876b 100644 --- a/configure.ac +++ b/configure.ac @@ -407,7 +407,7 @@ AC_CHECK_HEADERS([net/if.h],,, [ ]) # Check for Apple header. This uncovers TARGET_OS_IPHONE, TARGET_OS_TV or TARGET_OS_WATCH -AC_CHECK_HEADERS([TargetConditionals.h]) +AC_CHECK_HEADERS([TargetConditionals.h],,, [AC_INCLUDES_DEFAULT]) # check for types. # Using own tests for int64* because autoconf builtin only give 32bit. diff --git a/doc/Changelog b/doc/Changelog index a524c7f3a..af11e488b 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,8 @@ - Fix deprecation test to work for iOS TVOS and WatchOS, it uses CFLAGS and CPPFLAGS and also checks if the item is unavailable. - Travis, fix script to fail when tasks fail. + - Travis, fix warning in ubsan compile. + - Fix configure Targetconfiditionals.h header check, to use compile. 23 March 2021: Wouter - Travis enable all tests again. Clang analyzer only a couple times,