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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2435B1382C5 for ; Sun, 31 Jan 2021 20:01:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52DE2E082B; Sun, 31 Jan 2021 20:01:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35876E082B for ; Sun, 31 Jan 2021 20:01:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0B68335CE9 for ; Sun, 31 Jan 2021 20:01:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB7E2478 for ; Sun, 31 Jan 2021 20:01:21 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1612123234.a25a763b7acf4ba6a02094ce0696baef94e617ee.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/httrack/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/httrack/httrack-3.49.2-r2.ebuild X-VCS-Directories: www-client/httrack/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: a25a763b7acf4ba6a02094ce0696baef94e617ee X-VCS-Branch: master Date: Sun, 31 Jan 2021 20:01:21 +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: 04e2b66b-a5cd-40ed-b969-655134307b26 X-Archives-Hash: 0124d5b5f60ad83e6369a17dd89e902b commit: a25a763b7acf4ba6a02094ce0696baef94e617ee Author: Sebastian Pipping gentoo org> AuthorDate: Sun Jan 31 20:00:34 2021 +0000 Commit: Sebastian Pipping gentoo 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 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) }