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 468BA15823F for ; Fri, 17 Nov 2023 15:09:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 752CB2BC023; Fri, 17 Nov 2023 15:09:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58D002BC023 for ; Fri, 17 Nov 2023 15:09:02 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92A10335D72 for ; Fri, 17 Nov 2023 15:09:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 137EE139A for ; Fri, 17 Nov 2023 15:09:00 +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: <1700233643.031e513506d3d9b474f8a5df01994578f531f1eb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/, net-proxy/squid/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/squid/files/squid-6.4-gcc14-algorithm.patch net-proxy/squid/squid-6.4.ebuild X-VCS-Directories: net-proxy/squid/ net-proxy/squid/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 031e513506d3d9b474f8a5df01994578f531f1eb X-VCS-Branch: master Date: Fri, 17 Nov 2023 15:09:00 +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: 7b9bcc94-2fbe-4be9-8f50-178a7dec0e58 X-Archives-Hash: f6283ce8c00aa715e12ceeea1b94e68e commit: 031e513506d3d9b474f8a5df01994578f531f1eb Author: Sam James gentoo org> AuthorDate: Fri Nov 17 14:54:17 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Nov 17 15:07:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031e5135 net-proxy/squid: fix build for GCC 14 (partially); use config cache for libltdl * Fix build for GCC 14 (missing include for std::find, not upstreamed it yet). There's another issue I still need to look at to do with class visibility. * Use config cache for libltdl which avoids some redundant configure checks. Closes: https://bugs.gentoo.org/917161 Signed-off-by: Sam James gentoo.org> net-proxy/squid/files/squid-6.4-gcc14-algorithm.patch | 12 ++++++++++++ net-proxy/squid/squid-6.4.ebuild | 3 +++ 2 files changed, 15 insertions(+) diff --git a/net-proxy/squid/files/squid-6.4-gcc14-algorithm.patch b/net-proxy/squid/files/squid-6.4-gcc14-algorithm.patch new file mode 100644 index 000000000000..3a509e029eb5 --- /dev/null +++ b/net-proxy/squid/files/squid-6.4-gcc14-algorithm.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/917161 +--- a/src/helper/Reply.cc ++++ b/src/helper/Reply.cc +@@ -17,6 +17,8 @@ + #include "rfc1738.h" + #include "SquidString.h" + ++#include ++ + Helper::Reply::Reply() : + result(Helper::Unknown) + { diff --git a/net-proxy/squid/squid-6.4.ebuild b/net-proxy/squid/squid-6.4.ebuild index 9b116ab8ff58..0ecdce7be628 100644 --- a/net-proxy/squid/squid-6.4.ebuild +++ b/net-proxy/squid/squid-6.4.ebuild @@ -77,6 +77,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.2-gentoo.patch "${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch + "${FILESDIR}"/${PN}-6.4-gcc14-algorithm.patch ) pkg_pretend() { @@ -124,6 +125,8 @@ src_prepare() { src_configure() { local myeconfargs=( + --cache-file="${S}"/config.cache + --datadir=/usr/share/squid --libexecdir=/usr/libexec/squid --localstatedir=/var