From e33db1e19b6863cf1b24f20e3406e7c1904b35ef Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 5 Jul 2017 17:20:56 +0000 Subject: [PATCH] Detect clang 5.0.0 correctly, and drop USE_GCC. Approved by: bdrewery (maintainer) PR: 218856 MFH: 2017Q3 --- devel/valgrind-devel/files/patch-configure.ac | 6 ++++-- devel/valgrind/files/patch-configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/devel/valgrind-devel/files/patch-configure.ac b/devel/valgrind-devel/files/patch-configure.ac index 295a0bed96c4..2d8a1a93a005 100644 --- a/devel/valgrind-devel/files/patch-configure.ac +++ b/devel/valgrind-devel/files/patch-configure.ac @@ -1,9 +1,10 @@ --- configure.ac.orig 2016-01-13 19:20:20 UTC +++ configure.ac -@@ -145,6 +145,18 @@ case "${is_clang}-${gcc_version}" in +@@ -145,7 +145,19 @@ notclang-5.*) AC_MSG_RESULT([ok (${gcc_version})]) ;; +- clang-2.9|clang-3.*|clang-4.*) + notclang-6.*) + AC_MSG_RESULT([ok (${gcc_version})]) + ;; @@ -16,6 +17,7 @@ + notclang-9.*) + AC_MSG_RESULT([ok (${gcc_version})]) + ;; - clang-2.9|clang-3.*|clang-4.*) ++ clang-2.9|clang-3.*|clang-4.*|clang-5.*) AC_MSG_RESULT([ok (clang-${gcc_version})]) ;; + *) diff --git a/devel/valgrind/files/patch-configure.ac b/devel/valgrind/files/patch-configure.ac index 295a0bed96c4..2d8a1a93a005 100644 --- a/devel/valgrind/files/patch-configure.ac +++ b/devel/valgrind/files/patch-configure.ac @@ -1,9 +1,10 @@ --- configure.ac.orig 2016-01-13 19:20:20 UTC +++ configure.ac -@@ -145,6 +145,18 @@ case "${is_clang}-${gcc_version}" in +@@ -145,7 +145,19 @@ notclang-5.*) AC_MSG_RESULT([ok (${gcc_version})]) ;; +- clang-2.9|clang-3.*|clang-4.*) + notclang-6.*) + AC_MSG_RESULT([ok (${gcc_version})]) + ;; @@ -16,6 +17,7 @@ + notclang-9.*) + AC_MSG_RESULT([ok (${gcc_version})]) + ;; - clang-2.9|clang-3.*|clang-4.*) ++ clang-2.9|clang-3.*|clang-4.*|clang-5.*) AC_MSG_RESULT([ok (clang-${gcc_version})]) ;; + *)