From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5AB63158093 for ; Sun, 3 Jul 2022 02:36:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72972E0918; Sun, 3 Jul 2022 02:36:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 48DFDE0918 for ; Sun, 3 Jul 2022 02:36:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CA01341CDF for ; Sun, 3 Jul 2022 02:36:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5406C501 for ; Sun, 3 Jul 2022 02:36:21 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1656815760.ad4a8aa185ee5c83bb775f398b93da9faf4431c6.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/, net-misc/curl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/curl/curl-7.84.0.ebuild net-misc/curl/files/curl-7.84.0-easylock.patch X-VCS-Directories: net-misc/curl/ net-misc/curl/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: ad4a8aa185ee5c83bb775f398b93da9faf4431c6 X-VCS-Branch: master Date: Sun, 3 Jul 2022 02:36:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a3c5f06f-1f14-4f06-a19a-7bf402ea6ee4 X-Archives-Hash: 09063eb1ca2bdff042fe847ceff0ecc3 commit: ad4a8aa185ee5c83bb775f398b93da9faf4431c6 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Jul 3 02:34:00 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Jul 3 02:36:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4a8aa1 net-misc/curl: Add build fix for e.g. gcc-12/riscv Patch comes from upstream master Signed-off-by: Andreas K. Hüttel gentoo.org> net-misc/curl/curl-7.84.0.ebuild | 1 + net-misc/curl/files/curl-7.84.0-easylock.patch | 30 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/net-misc/curl/curl-7.84.0.ebuild b/net-misc/curl/curl-7.84.0.ebuild index c55c9520aa81..645a223aed8f 100644 --- a/net-misc/curl/curl-7.84.0.ebuild +++ b/net-misc/curl/curl-7.84.0.ebuild @@ -95,6 +95,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-7.84.0-easylock.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch "${FILESDIR}"/${PN}-7.84.0-include-sched.patch ) diff --git a/net-misc/curl/files/curl-7.84.0-easylock.patch b/net-misc/curl/files/curl-7.84.0-easylock.patch new file mode 100644 index 000000000000..77ee610fc117 --- /dev/null +++ b/net-misc/curl/files/curl-7.84.0-easylock.patch @@ -0,0 +1,30 @@ +From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 28 Jun 2022 09:00:25 +0200 +Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool + +To work with more compilers without requiring separate libs to +link. Like with gcc-12 for RISC-V on Linux. + +Reported-by: Adam Sampson +Fixes #9055 +Closes #9061 +--- + lib/easy_lock.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/easy_lock.h b/lib/easy_lock.h +index 07c85c5ffdd19..9c11bc50c5f20 100644 +--- a/lib/easy_lock.h ++++ b/lib/easy_lock.h +@@ -40,8 +40,8 @@ + #include + #endif + +-#define curl_simple_lock atomic_bool +-#define CURL_SIMPLE_LOCK_INIT false ++#define curl_simple_lock atomic_int ++#define CURL_SIMPLE_LOCK_INIT 0 + + static inline void curl_simple_lock_lock(curl_simple_lock *lock) + {