commit: a25a763b7acf4ba6a02094ce0696baef94e617ee Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Sun Jan 31 20:00:34 2021 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Sun Jan 31 20:00:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a25a763b
www-client/httrack: Fix linking with lld for profile 17.1 Closes: https://bugs.gentoo.org/732272 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> Package-Manager: Portage-3.0.14, Repoman-3.0.2 www-client/httrack/httrack-3.49.2-r2.ebuild | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild b/www-client/httrack/httrack-3.49.2-r2.ebuild index 11539e76c33..a6bded23cc6 100644 --- a/www-client/httrack/httrack-3.49.2-r2.ebuild +++ b/www-client/httrack/httrack-3.49.2-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -inherit eutils xdg-utils +inherit autotools multilib eutils xdg-utils DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser" HOMEPAGE="https://www.httrack.com/"; @@ -26,6 +26,20 @@ PATCHES=( "${FILESDIR}"/${PN}-3.48.13-minizip.patch ) +src_prepare() { + default + + # We need to patch use of /usr/lib because it is a problem with + # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/732272). + # The grep sandwich acts as a regression test so that a future + # version bump cannot break patching without noticing. + grep -wq '{ZLIB_HOME}/lib' m4/check_zlib.m4 || die + sed "s,{ZLIB_HOME}/lib,{ZLIB_HOME}/$(get_libdir)," -i m4/check_zlib.m4 || die + grep -w '{ZLIB_HOME}/lib' m4/check_zlib.m4 && die + + eautoreconf +} + src_configure() { econf $(use_enable static-libs static) }
