diff options
| author |   Sam James <sam@gentoo.org> | 2023-11-17 14:54:17 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-11-17 15:07:23 +0000 |
| commit | 031e513506d3d9b474f8a5df01994578f531f1eb (patch) | |
| tree | eca4d0e42862a4b9e2d8bb308b068b85e07e7dc1 | |
| parent | net-proxy/squid: add 6.4 (diff) | |
| download | gentoo-031e513506d3d9b474f8a5df01994578f531f1eb.tar.gz gentoo-031e513506d3d9b474f8a5df01994578f531f1eb.tar.bz2 gentoo-031e513506d3d9b474f8a5df01994578f531f1eb.zip | |
net-proxy/squid: fix build for GCC 14 (partially); use config cache for libltdl
* Fix build for GCC 14 (missing <algorithm> 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 <sam@gentoo.org>
| -rw-r--r-- | net-proxy/squid/files/squid-6.4-gcc14-algorithm.patch | 12 | ||||
| -rw-r--r-- | net-proxy/squid/squid-6.4.ebuild | 3 |
2 files changed, 15 insertions, 0 deletions
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 <algorithm> ++ + 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 |