summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-03-22 00:50:20 +0000
committerSam James <sam@gentoo.org>2022-03-22 00:50:27 +0000
commitafd1d01bb5925d9c0be7a30ad985adc002c77207 (patch)
tree52c6c84d83ba8fbc99730fe90efefc4b071c41ab /net-proxy/squid
parentprofiles: Mask dev-lang/vala:0.56 as well (diff)
downloadgentoo-afd1d01bb5925d9c0be7a30ad985adc002c77207.tar.gz
gentoo-afd1d01bb5925d9c0be7a30ad985adc002c77207.tar.bz2
gentoo-afd1d01bb5925d9c0be7a30ad985adc002c77207.zip
net-proxy/squid: use system libltdl (avoid maintainer mode automake)
This bug has quite a long story, apparently, but it seems to be enough here to just drop the subdir & force usage of the system version with configure arguments (previous arguments weren't quite right). Closes: https://bugs.gentoo.org/830099 Signed-off-by: Sam James <sam@gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/23545 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-proxy/squid')
-rw-r--r--net-proxy/squid/files/squid-4.17-use-system-libltdl.patch16
-rw-r--r--net-proxy/squid/squid-4.17.ebuild6
-rw-r--r--net-proxy/squid/squid-5.4.1-r1.ebuild6
3 files changed, 24 insertions, 4 deletions
diff --git a/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch b/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch
new file mode 100644
index 000000000000..219f2ab6cf70
--- /dev/null
+++ b/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/830099
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,11 +6,8 @@
+ ##
+
+ AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
+-DIST_SUBDIRS = compat lib libltdl scripts icons errors contrib doc src test-suite tools
++DIST_SUBDIRS = compat lib scripts icons errors contrib doc src test-suite tools
+ SUBDIRS = compat lib
+-if ENABLE_LOADABLE_MODULES
+-SUBDIRS += libltdl
+-endif
+ SUBDIRS += scripts icons errors doc src tools test-suite
+
+ DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
diff --git a/net-proxy/squid/squid-4.17.ebuild b/net-proxy/squid/squid-4.17.ebuild
index 92eaac54a145..b0395042c782 100644
--- a/net-proxy/squid/squid-4.17.ebuild
+++ b/net-proxy/squid/squid-4.17.ebuild
@@ -79,6 +79,7 @@ pkg_pretend() {
src_prepare() {
eapply "${FILESDIR}/${PN}-4.3-gentoo.patch"
+ eapply "${FILESDIR}/${PN}-4.17-use-system-libltdl.patch"
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
INSTALL QUICKSTART \
@@ -197,8 +198,9 @@ src_configure() {
--with-build-environment=default \
--disable-strict-error-checking \
--disable-arch-native \
- --with-included-ltdl=/usr/include \
- --with-ltdl-libdir=/usr/$(get_libdir) \
+ --without-included-ltdl \
+ --with-ltdl-include="${ESYSROOT}"/usr/include \
+ --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir) \
$(use_with caps libcap) \
$(use_enable ipv6) \
$(use_enable snmp) \
diff --git a/net-proxy/squid/squid-5.4.1-r1.ebuild b/net-proxy/squid/squid-5.4.1-r1.ebuild
index e5e9b869626f..d4d5ab2fd4fa 100644
--- a/net-proxy/squid/squid-5.4.1-r1.ebuild
+++ b/net-proxy/squid/squid-5.4.1-r1.ebuild
@@ -81,6 +81,7 @@ pkg_pretend() {
src_prepare() {
eapply "${FILESDIR}/${PN}-5.3-gentoo.patch"
+ eapply "${FILESDIR}/${PN}-4.17-use-system-libltdl.patch"
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
INSTALL QUICKSTART \
@@ -199,8 +200,9 @@ src_configure() {
--with-build-environment=default \
--disable-strict-error-checking \
--disable-arch-native \
- --with-included-ltdl=/usr/include \
- --with-ltdl-libdir=/usr/$(get_libdir) \
+ --without-included-ltdl \
+ --with-ltdl-include="${ESYSROOT}"/usr/include \
+ --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir) \
$(use_with caps libcap) \
$(use_enable ipv6) \
$(use_enable snmp) \