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 51AA215806E for ; Fri, 26 May 2023 04:30:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86617E0856; Fri, 26 May 2023 04:30:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 63492E0856 for ; Fri, 26 May 2023 04:30:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 32FA8340FC0 for ; Fri, 26 May 2023 04:30:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8AC6BA5A for ; Fri, 26 May 2023 04:30:46 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685075437.3cb247e73e86b39815c50982f328562151af7ad8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/, net-misc/curl/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/curl/curl-8.1.1.ebuild net-misc/curl/files/curl-8.1.1-configure-compiler.patch X-VCS-Directories: net-misc/curl/ net-misc/curl/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3cb247e73e86b39815c50982f328562151af7ad8 X-VCS-Branch: master Date: Fri, 26 May 2023 04:30:46 +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: 1f4a6797-2c82-4103-8ff2-7d085b47b5d8 X-Archives-Hash: 13b2a8e8c89c451aa53995daf61a16d9 commit: 3cb247e73e86b39815c50982f328562151af7ad8 Author: Sam James gentoo org> AuthorDate: Fri May 26 04:30:33 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 26 04:30:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb247e7 net-misc/curl: fix hanging configure test Signed-off-by: Sam James gentoo.org> net-misc/curl/curl-8.1.1.ebuild | 1 + .../curl/files/curl-8.1.1-configure-compiler.patch | 73 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/net-misc/curl/curl-8.1.1.ebuild b/net-misc/curl/curl-8.1.1.ebuild index 1f799eeab629..1240b566e376 100644 --- a/net-misc/curl/curl-8.1.1.ebuild +++ b/net-misc/curl/curl-8.1.1.ebuild @@ -124,6 +124,7 @@ PATCHES=( ### Backports "${FILESDIR}"/${P}-hanging-http2.patch + "${FILESDIR}"/${P}-configure-compiler.patch ) src_prepare() { diff --git a/net-misc/curl/files/curl-8.1.1-configure-compiler.patch b/net-misc/curl/files/curl-8.1.1-configure-compiler.patch new file mode 100644 index 000000000000..f769b35880cf --- /dev/null +++ b/net-misc/curl/files/curl-8.1.1-configure-compiler.patch @@ -0,0 +1,73 @@ +The check for "basic compiler options" hangs otherwise. + +https://github.com/curl/curl/commit/471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36 +https://github.com/curl/curl/commit/c4a019603b82a08c3572591a9393df0818ee02f6 + +From 471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Tue, 23 May 2023 09:40:18 +0200 +Subject: [PATCH] configure: quote the assignments for run-compiler + +Building for multilib failed, as the compiler command contains an +extra argument. That needs quoting. + +Regression from b78ca50cb3dda361f9c1 + +Fixes #11179 +Closes #11180 +--- a/configure.ac ++++ b/configure.ac +@@ -193,8 +193,8 @@ dnl something different but only have that affect the execution of the results + dnl of the compile, not change the libraries for the compiler itself. + dnl + compilersh="run-compiler" +-echo "CC=$CC" > $compilersh +-echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $compilersh ++echo "CC=\"$CC\"" > $compilersh ++echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh + echo 'exec $CC $@' >> $compilersh + + dnl ********************************************************************** + +From c4a019603b82a08c3572591a9393df0818ee02f6 Mon Sep 17 00:00:00 2001 +From: Emanuele Torre +Date: Tue, 23 May 2023 11:59:59 +0200 +Subject: [PATCH] configure: fix build with arbitrary CC and LD_LIBRARY_PATH + +Since ./configure and processes that inherit its environment variables +are the only callers of the run-compiler script, we can just save the +current value of the LD_LIBRARY_PATH and CC variables to another pair of +environment variables, and make run-compiler a static script that +simply restores CC and LD_LIBRARY_PATH to the saved value, and before +running the compiler. + +This avoids having to inject the values of the variables in the script, +possibly causing problems if they contains spaces, quotes, and other +special characters. + +Also add exports in the script just in case LD_LIBRARY_PATH and CC are +not already in the environment. + +follow-up from 471dab2 + +Closes #11182 +--- a/configure.ac ++++ b/configure.ac +@@ -193,9 +193,13 @@ dnl something different but only have that affect the execution of the results + dnl of the compile, not change the libraries for the compiler itself. + dnl + compilersh="run-compiler" +-echo "CC=\"$CC\"" > $compilersh +-echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh +-echo 'exec $CC $@' >> $compilersh ++export "CURL_SAVED_CC=$CC" ++export "CURL_SAVED_LD_LIBRARY_PATH=$LD_LIBRARY_PATH" ++cat <<\EOF > "$compilersh" ++export "CC=$CURL_SAVED_CC" ++export "LD_LIBRARY_PATH=$CURL_SAVED_LD_LIBRARY_PATH" ++exec $CC "$@" ++EOF + + dnl ********************************************************************** + dnl See which TLS backend(s) that are requested. Just do all the +