From nobody Sat Aug 13 18:54:54 2022 X-Original-To: dev-commits-ports-branches@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 4M4qV72GfDz4YYkG; Sat, 13 Aug 2022 18:54:55 +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 4M4qV71kwLz3kJJ; Sat, 13 Aug 2022 18:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660416895; 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=nrIC2UYAVr/cEKZTaNc/L++5whgRhIA9xdRYOKpkJ78=; b=QB4293F+cW4CN40JMH9jDwYlU+ju79qT41HhtdKfL+WUzdLDqO8FFjrcAIELA5gKFzoC8A ocpV8x4OS8f15+GGa5+gLVVmT9ecltaa2HhU53C/J8Gn/+S4ur70ZcA8/wAbGZFiDhXU1A Z/pJ4HIz+NAnRAvkJ+ZVbxN37d+gk6Os8gn8t79uFqPkXr9ZYkIaKqzQndud3t4MrOi1P2 h8+K4Gh+F9Jsb9r+OOEYO6g+WlrOfHy9hT/HpL6yGcnGZnjMJG6GAd60UcRUIHVJkHvapq L+IWOxbttMRUO0n2JxID2WMvm5QNvbai/oL1WVzCTwjSwb5Ogvryx6xmimoKLw== 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 4M4qV70lSyzMfx; Sat, 13 Aug 2022 18:54:55 +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 27DIstbj072853; Sat, 13 Aug 2022 18:54:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27DIssHU072852; Sat, 13 Aug 2022 18:54:54 GMT (envelope-from git) Date: Sat, 13 Aug 2022 18:54:54 GMT Message-Id: <202208131854.27DIssHU072852@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 4d45e445eb83 - 2022Q3 - devel/xxhash: fix static_assert to _Static_assert List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 4d45e445eb831ec162b4d92e89a7b83878d14f9d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660416895; 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=nrIC2UYAVr/cEKZTaNc/L++5whgRhIA9xdRYOKpkJ78=; b=LpLoHSqDb0RJETrY0TI4Wx8LCSAU1e9MCyrTSvonjSNHukaEYE6yyR6ZAgPhRk1IsXmQzB 87kQUmddbjdHFFHgUifC6NDKTWg5xhd7wFUR3/WVepVkKvPg4rSTrHby71E+iEaWDusitY kL3HnYTqQ1swsnizlYlDaNkWymp02/gjiP6qOTcfd7DsUNbDTRukidRgtTVOzfoDwnQCmO QhCVEN/xRkUnbXrdXueTNhjtesE8xH91pXRPIKdZN5X+nQb8uYGampMztt17qr81cqAOke fSGopD9h144V3fu4qyx8w9X2M4tF9ADjvaLjl53QyLQ1L5/nF3xskI05Ee80OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660416895; a=rsa-sha256; cv=none; b=wlbbkmkVxjPeRtMaday483GwbLYx7wXLOyuKhuABFT9E9y3yqCO9OdAYmq8C3AbKwPanJJ Ev7UFhTBA6RudErR6zv/2UCoS8wvnq7jioLbnONuq411WzCv8ixhqBxKKAO2jlLsStOFV4 JVGCKB849nyombDJeP+EfNZA+8njy1WcM03ncdUR6wnFFZkGRDHJEsDIYEpiRF8b+uSu0o Sz/N4zthTCe/5O7hubiGWXw/fwmQEglWtOcPEV8L8S561ZQKdoOBumWm+Sm7SLfS9tHf+t apORIzFvAPQSurOvfrSMvHIvSNtNUj18EyC5IBC1Y6x+Evn/MiNoKOrrSyp31w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d45e445eb831ec162b4d92e89a7b83878d14f9d commit 4d45e445eb831ec162b4d92e89a7b83878d14f9d Author: Thierry Dussuet AuthorDate: 2022-08-13 18:35:43 +0000 Commit: Matthias Andree CommitDate: 2022-08-13 18:52:06 +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 (cherry picked from commit 8a4d5e26a9721eae2deba5fef794a2e593170658) --- 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