From owner-svn-ports-all@freebsd.org Fri Feb 21 06:58:12 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 57904254856;
Fri, 21 Feb 2020 06:58:12 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 48P2NK4Jfyz3Md3;
Fri, 21 Feb 2020 06:58:09 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E7846E42;
Fri, 21 Feb 2020 06:58:09 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01L6w9Bj052665;
Fri, 21 Feb 2020 06:58:09 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01L6w7Ud052659;
Fri, 21 Feb 2020 06:58:07 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <202002210658.01L6w7Ud052659@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 21 Feb 2020 06:58:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r526608 - in head/devel: valgrind valgrind-devel
valgrind-devel/files valgrind/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: dim
X-SVN-Commit-Paths: in head/devel: valgrind valgrind-devel
valgrind-devel/files valgrind/files
X-SVN-Commit-Revision: 526608
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Feb 2020 06:58:12 -0000
Author: dim (src committer)
Date: Fri Feb 21 06:58:07 2020
New Revision: 526608
URL: https://svnweb.freebsd.org/changeset/ports/526608
Log:
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: zeising (maintainer)
MFH: 2020Q1
Added:
head/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c (contents, props changed)
head/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c (contents, props changed)
Modified:
head/devel/valgrind-devel/Makefile
head/devel/valgrind-devel/files/patch-configure.ac
head/devel/valgrind/Makefile
head/devel/valgrind/files/patch-configure.ac
Modified: head/devel/valgrind-devel/Makefile
==============================================================================
--- head/devel/valgrind-devel/Makefile Fri Feb 21 06:56:46 2020 (r526607)
+++ head/devel/valgrind-devel/Makefile Fri Feb 21 06:58:07 2020 (r526608)
@@ -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=/ \
Added: head/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c Fri Feb 21 06:58:07 2020 (r526608)
@@ -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: head/devel/valgrind-devel/files/patch-configure.ac
==============================================================================
--- head/devel/valgrind-devel/files/patch-configure.ac Fri Feb 21 06:56:46 2020 (r526607)
+++ head/devel/valgrind-devel/files/patch-configure.ac Fri Feb 21 06:58:07 2020 (r526608)
@@ -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: head/devel/valgrind/Makefile
==============================================================================
--- head/devel/valgrind/Makefile Fri Feb 21 06:56:46 2020 (r526607)
+++ head/devel/valgrind/Makefile Fri Feb 21 06:58:07 2020 (r526608)
@@ -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=/ \
Added: head/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c Fri Feb 21 06:58:07 2020 (r526608)
@@ -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: head/devel/valgrind/files/patch-configure.ac
==============================================================================
--- head/devel/valgrind/files/patch-configure.ac Fri Feb 21 06:56:46 2020 (r526607)
+++ head/devel/valgrind/files/patch-configure.ac Fri Feb 21 06:58:07 2020 (r526608)
@@ -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})])
;;
*)