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 A9F9A13835A for ; Wed, 16 Sep 2020 02:01:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5F24E0831; Wed, 16 Sep 2020 02:01:06 +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 8A755E0831 for ; Wed, 16 Sep 2020 02:01:06 +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 DFA0A34067D for ; Wed, 16 Sep 2020 02:01:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B28C365 for ; Wed, 16 Sep 2020 02:01:03 +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: <1600221634.9cc464c43d3ebd1c493244b3e5816c65eb0a2aa5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/siege/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-benchmarks/siege/siege-4.0.7.ebuild X-VCS-Directories: app-benchmarks/siege/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9cc464c43d3ebd1c493244b3e5816c65eb0a2aa5 X-VCS-Branch: master Date: Wed, 16 Sep 2020 02:01:03 +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: 4a4373a5-5968-41f2-9eb3-0b1e1912e6a8 X-Archives-Hash: 34e463c1cf49e3e4cfedd159304a778f commit: 9cc464c43d3ebd1c493244b3e5816c65eb0a2aa5 Author: Sam James gentoo org> AuthorDate: Wed Sep 16 02:00:34 2020 +0000 Commit: Sam James gentoo org> CommitDate: Wed Sep 16 02:00:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc464c4 app-benchmarks/siege: forward-port LDFLAGS changes Bug: https://bugs.gentoo.org/732886 Closes: https://github.com/gentoo/gentoo/pull/17356 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> app-benchmarks/siege/siege-4.0.7.ebuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app-benchmarks/siege/siege-4.0.7.ebuild b/app-benchmarks/siege/siege-4.0.7.ebuild index 96acf64824f..7309c86336a 100644 --- a/app-benchmarks/siege/siege-4.0.7.ebuild +++ b/app-benchmarks/siege/siege-4.0.7.ebuild @@ -23,7 +23,12 @@ DEPEND="${RDEPEND}" src_prepare() { default # bundled macros break recent libtool - sed -i -e '/AC_PROG_SHELL/d' configure.ac || die + # remove /usr/lib from LDFLAGS, bug #732886 + sed -i \ + -e '/AC_PROG_SHELL/d' \ + -e 's/SSL_LDFLAGS="-L.*lib"/SSL_LDFLAGS=""/g' \ + -e 's/Z_LDFLAGS="-L.*lib"/Z_LDFLAGS=""/g' \ + configure.ac || die rm *.m4 || die "failed to remove bundled macros" eautoreconf } @@ -36,7 +41,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install + emake DESTDIR="${ED}" install dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt