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 F076D1382C5 for ; Tue, 8 Jun 2021 07:52:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40884E0828; Tue, 8 Jun 2021 07:52:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2BAD4E0828 for ; Tue, 8 Jun 2021 07:52:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 1A9FF33BEF5 for ; Tue, 8 Jun 2021 07:52:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 742D874A for ; Tue, 8 Jun 2021 07:52:10 +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: <1623138710.bc42a3e1c3bd8b861936c63593fbbd525856a877.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/scotch/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/scotch/scotch-6.0.4-r2.ebuild X-VCS-Directories: sci-libs/scotch/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bc42a3e1c3bd8b861936c63593fbbd525856a877 X-VCS-Branch: master Date: Tue, 8 Jun 2021 07:52:10 +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: 92ea5614-793b-484e-af36-09b78f33daa2 X-Archives-Hash: 2f9658a88bc45f13508911f8a7ea711e commit: bc42a3e1c3bd8b861936c63593fbbd525856a877 Author: Sam James gentoo org> AuthorDate: Tue Jun 8 07:51:50 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 8 07:51:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc42a3e1 sci-libs/scotch: fix toolchain sed for e.g. arm Closes: https://bugs.gentoo.org/577272 Signed-off-by: Sam James gentoo.org> sci-libs/scotch/scotch-6.0.4-r2.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sci-libs/scotch/scotch-6.0.4-r2.ebuild b/sci-libs/scotch/scotch-6.0.4-r2.ebuild index 8af0ccfe611..4a01b91e5ca 100644 --- a/sci-libs/scotch/scotch-6.0.4-r2.ebuild +++ b/sci-libs/scotch/scotch-6.0.4-r2.ebuild @@ -64,10 +64,12 @@ src_prepare() { -e 's/ -DSCOTCH_PTHREAD//' \ src/Make.inc/Makefile.inc.i686_pc_linux3 || die fi - sed -e "s/gcc/$(tc-getCC)/" \ + + # Be careful with replacing here, bug #577272 + sed -e "s/= gcc$/= $(tc-getCC)/" \ -e "s/-O3/${CFLAGS} -pthread/" \ - -e "s/ ar/ $(tc-getAR)/" \ - -e "s/ranlib/$(tc-getRANLIB)/" \ + -e "s/= ar$/= $(tc-getAR)/" \ + -e "s/= ranlib$/= $(tc-getRANLIB)/" \ -e "s/LDFLAGS/LIBS/" \ src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die }