From nobody Sat Aug 13 18:51:30 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4qQC20h2z4YXfw; Sat, 13 Aug 2022 18:51:31 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M4qQC1VBkz3jmn; Sat, 13 Aug 2022 18:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660416691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UIwG7yexs10BCxDn+eBSOV+3qF87cXy9GHUkmx/NKds=; b=j0Q1GRN1dQ0JOTBxsPySZZ4kSC4QIeCwYS29f0fP0YG/+IbtnpzVj7A4HIldqhByeYTddv j4VJ6lFWJvRtHqZsSHqUrnxol0vFHjouh22shAWA9gEdizgwWyCPkt41TYo2m8SCk0dUZr 0bSbvGkj7Fb3BjZhWopv87TM53G7oiirAAOv/tAK7kamlTQfVvipwYE5Qn8AHu/XTRQ2wW 0Gcgb8R5jg2lbT4eTiElz1/0adwQXeNLLCjQQp0J7qOQ/x0NHhCCc837QukKGkENol0NDG qbkUvZto5tRMybzLAFD21S+XjhK6MYK+RQ9a7X+hYRnHx+Nt/FoR+kSr02acJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M4qQC0YXCzMYQ; Sat, 13 Aug 2022 18:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27DIpU0o069720; Sat, 13 Aug 2022 18:51:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27DIpUCU069719; Sat, 13 Aug 2022 18:51:30 GMT (envelope-from git) Date: Sat, 13 Aug 2022 18:51:30 GMT Message-Id: <202208131851.27DIpUCU069719@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 8a4d5e26a972 - main - devel/xxhash: fix static_assert to _Static_assert List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a4d5e26a9721eae2deba5fef794a2e593170658 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660416691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UIwG7yexs10BCxDn+eBSOV+3qF87cXy9GHUkmx/NKds=; b=O/RQWFPHKGqUKXFFstRdny32JVfZ1YhBYlDiGwYNMFxrWo9DdwDk5Fv11MMYIG8c3UdsFv CM6RlELVhPuzXDreZJm78L+CjLQH4b7UoW1uoTWGNEZsCkoIqMN/vTFZeuhddDtbW0TjFx yQcD8zD6Lum4LrMfxpM/cMfTA//vd14hsK6cq0vKiAkvhU6nYw3M9TxNSIXdNGMfPwUoee p6km6UvyWD+WIMAQvjttmi1irdv2RJBGYcSGxZZiGb8otuppI2nmqtkVVqA1jUl9J94JGx jRfCK93y94JFoLJQJJ/h/mh4Vg+ASb4otXkHEgt0JCXLKhxWpd2Cow5moR4D2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660416691; a=rsa-sha256; cv=none; b=ZkqQgi2ORxGOT8rliwEVR3wor8WaahhiIjr+DVH0tceB9Xe+30QBtV71xNFdZjEpAXc4Xc Ugx06RHNtgqevHRw60lm8YenOYMefG5jL7TwxK/FqnGvJJYVVFJh7eqx1rnc4Il2QPlfgn 8zNSiCbdIVX9D1TL6VrjlVggqAfkoex/fxkv/zkRKdNvzVXaYYhx2cAxGp1oboGJkqC14w L7He++h3yTauCVCiUjn9jsT6UA65N1rEPzaSv8t9/6bkoGjdAD0TAQUPIRdhvWHWJiyZZv UuGUr+P70Wi1p+vbqLId5Mgq2TU/Sz9wTKrp+GqaHgR+nfRbp1WFZpHj6AEdzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a4d5e26a9721eae2deba5fef794a2e593170658 commit 8a4d5e26a9721eae2deba5fef794a2e593170658 Author: Thierry Dussuet AuthorDate: 2022-08-13 18:35:43 +0000 Commit: Matthias Andree CommitDate: 2022-08-13 18:43:27 +0000 devel/xxhash: fix static_assert to _Static_assert This fixes C11+ users of xxhash that do not #include PR: 265819 Approved by: portmgr@ (blanket, one-line fix to unbreak py-borgbackup) MFH: 2022Q3 --- devel/xxhash/Makefile | 2 +- devel/xxhash/files/patch-xxhash.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/devel/xxhash/Makefile b/devel/xxhash/Makefile index aa971e1fd084..988561039bf0 100644 --- a/devel/xxhash/Makefile +++ b/devel/xxhash/Makefile @@ -1,6 +1,6 @@ PORTNAME= xxhash PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/xxhash/files/patch-xxhash.h b/devel/xxhash/files/patch-xxhash.h new file mode 100644 index 000000000000..d005011ddc4f --- /dev/null +++ b/devel/xxhash/files/patch-xxhash.h @@ -0,0 +1,12 @@ +--- xxhash.h.orig 2022-08-13 18:58:45.930785000 +0200 ++++ xxhash.h 2022-08-13 18:59:08.416809000 +0200 +@@ -1546,8 +1546,7 @@ + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else