Date: Fri, 21 Feb 2020 21:29:58 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r526719 - in branches/2020Q1/devel: valgrind valgrind-devel valgrind-devel/files valgrind/files Message-ID: <202002212129.01LLTw1c085036@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim (src committer) Date: Fri Feb 21 21:29:58 2020 New Revision: 526719 URL: https://svnweb.freebsd.org/changeset/ports/526719 Log: MFH: r526608 devel/valgrind(-devel): Fix compiler version detection hopefully forever Every time a compiler major version is bumped, we run into this exact same error: ===> Configuring for valgrind-3.10.1.20160113_7,1 ... checking for a supported version of gcc... no (10.0.0) configure: error: please use gcc >= 3.0 or clang >= 2.9 Attempt to fix this for all versions in the future. Other fix included: don't use undefined behavior to implement offsetof, just use the official builtin function instead. Approved by: portmgr (joneum) PR: 244234 Added: branches/2020Q1/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c - copied unchanged from r526608, head/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c branches/2020Q1/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c - copied unchanged from r526608, head/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c Modified: branches/2020Q1/devel/valgrind-devel/Makefile branches/2020Q1/devel/valgrind-devel/files/patch-configure.ac branches/2020Q1/devel/valgrind/Makefile branches/2020Q1/devel/valgrind/files/patch-configure.ac Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/devel/valgrind-devel/Makefile ============================================================================== --- branches/2020Q1/devel/valgrind-devel/Makefile Fri Feb 21 21:15:07 2020 (r526718) +++ branches/2020Q1/devel/valgrind-devel/Makefile Fri Feb 21 21:29:58 2020 (r526719) @@ -4,7 +4,7 @@ PORTNAME= valgrind PORTVERSION= 3.10.1.20160113 DISTVERSIONPREFIX= freebsd- -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \ Copied: branches/2020Q1/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c (from r526608, head/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c Fri Feb 21 21:29:58 2020 (r526719, copy of r526608, head/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c) @@ -0,0 +1,11 @@ +--- VEX/auxprogs/genoffsets.c 2016-01-13 19:20:20 UTC ++++ VEX/auxprogs/genoffsets.c +@@ -59,7 +59,7 @@ + #define VG_STRINGIFZ(__str) #__str + #define VG_STRINGIFY(__str) VG_STRINGIFZ(__str) + +-#define my_offsetof(__type,__field) (&((__type*)0)->__field) ++#define my_offsetof(__type,__field) offsetof(__type,__field) + + /* This forces gcc to evaluate the my_offsetof call at compile time, + and then emits it in the assembly, along with the nonsense string Modified: branches/2020Q1/devel/valgrind-devel/files/patch-configure.ac ============================================================================== --- branches/2020Q1/devel/valgrind-devel/files/patch-configure.ac Fri Feb 21 21:15:07 2020 (r526718) +++ branches/2020Q1/devel/valgrind-devel/files/patch-configure.ac Fri Feb 21 21:29:58 2020 (r526719) @@ -1,23 +1,21 @@ --- configure.ac.orig 2016-01-13 19:20:20 UTC +++ configure.ac -@@ -145,7 +145,19 @@ - notclang-5.*) +@@ -136,16 +136,10 @@ + AM_CONDITIONAL(COMPILER_IS_CLANG, test $is_clang = clang) + + case "${is_clang}-${gcc_version}" in +- notclang-3.*) ++ notclang-[[3-9]].*|notclang-[[1-9]][[0-9]]*) AC_MSG_RESULT([ok (${gcc_version})]) ;; +- notclang-4.*) +- AC_MSG_RESULT([ok (${gcc_version})]) +- ;; +- notclang-5.*) +- AC_MSG_RESULT([ok (${gcc_version})]) +- ;; - clang-2.9|clang-3.*|clang-4.*) -+ notclang-6.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-7.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-8.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-9.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ clang-2.9|clang-[[3-9]].*) ++ clang-2.9|clang-[[3-9]].*|clang-[[1-9]][[0-9]]*) AC_MSG_RESULT([ok (clang-${gcc_version})]) ;; *) Modified: branches/2020Q1/devel/valgrind/Makefile ============================================================================== --- branches/2020Q1/devel/valgrind/Makefile Fri Feb 21 21:15:07 2020 (r526718) +++ branches/2020Q1/devel/valgrind/Makefile Fri Feb 21 21:29:58 2020 (r526719) @@ -4,7 +4,7 @@ PORTNAME= valgrind PORTVERSION= 3.10.1.20160113 DISTVERSIONPREFIX= freebsd- -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \ Copied: branches/2020Q1/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c (from r526608, head/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c Fri Feb 21 21:29:58 2020 (r526719, copy of r526608, head/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c) @@ -0,0 +1,11 @@ +--- VEX/auxprogs/genoffsets.c 2016-01-13 19:20:20 UTC ++++ VEX/auxprogs/genoffsets.c +@@ -59,7 +59,7 @@ + #define VG_STRINGIFZ(__str) #__str + #define VG_STRINGIFY(__str) VG_STRINGIFZ(__str) + +-#define my_offsetof(__type,__field) (&((__type*)0)->__field) ++#define my_offsetof(__type,__field) offsetof(__type,__field) + + /* This forces gcc to evaluate the my_offsetof call at compile time, + and then emits it in the assembly, along with the nonsense string Modified: branches/2020Q1/devel/valgrind/files/patch-configure.ac ============================================================================== --- branches/2020Q1/devel/valgrind/files/patch-configure.ac Fri Feb 21 21:15:07 2020 (r526718) +++ branches/2020Q1/devel/valgrind/files/patch-configure.ac Fri Feb 21 21:29:58 2020 (r526719) @@ -1,23 +1,21 @@ --- configure.ac.orig 2016-01-13 19:20:20 UTC +++ configure.ac -@@ -145,7 +145,19 @@ - notclang-5.*) +@@ -136,16 +136,10 @@ + AM_CONDITIONAL(COMPILER_IS_CLANG, test $is_clang = clang) + + case "${is_clang}-${gcc_version}" in +- notclang-3.*) ++ notclang-[[3-9]].*|notclang-[[1-9]][[0-9]]*) AC_MSG_RESULT([ok (${gcc_version})]) ;; +- notclang-4.*) +- AC_MSG_RESULT([ok (${gcc_version})]) +- ;; +- notclang-5.*) +- AC_MSG_RESULT([ok (${gcc_version})]) +- ;; - clang-2.9|clang-3.*|clang-4.*) -+ notclang-6.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-7.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-8.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-9.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ clang-2.9|clang-[[3-9]].*) ++ clang-2.9|clang-[[3-9]].*|clang-[[1-9]][[0-9]]*) AC_MSG_RESULT([ok (clang-${gcc_version})]) ;; *)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002212129.01LLTw1c085036>