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 4E1951382C5 for ; Fri, 25 Dec 2020 22:21:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B54AE0B2E; Fri, 25 Dec 2020 22:21:54 +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 6D3CAE0B2E for ; Fri, 25 Dec 2020 22:21:54 +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 E85833419F2 for ; Fri, 25 Dec 2020 22:21:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AD31B8 for ; Fri, 25 Dec 2020 22:21:51 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1608934907.1975eb868186fba89ce71397ecdeed5dfaad0c0b.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/silo/silo-1.4.14_p20200602.ebuild X-VCS-Directories: sys-boot/silo/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 1975eb868186fba89ce71397ecdeed5dfaad0c0b X-VCS-Branch: master Date: Fri, 25 Dec 2020 22:21:51 +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: 2b874a6e-b65b-4115-9cc9-1e1285ce1fd0 X-Archives-Hash: e41e513799e5bb11add261c9b6729421 commit: 1975eb868186fba89ce71397ecdeed5dfaad0c0b Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Dec 25 22:21:27 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Dec 25 22:21:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1975eb86 sys-boot/silo: fix USE=tilo-only, honot CC Reported-by: Rolf Eike Beer Bug: https://bugs.gentoo.org/759655 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich gentoo.org> sys-boot/silo/silo-1.4.14_p20200602.ebuild | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/sys-boot/silo/silo-1.4.14_p20200602.ebuild b/sys-boot/silo/silo-1.4.14_p20200602.ebuild index deeed7b293d..42f7fc37254 100644 --- a/sys-boot/silo/silo-1.4.14_p20200602.ebuild +++ b/sys-boot/silo/silo-1.4.14_p20200602.ebuild @@ -33,24 +33,30 @@ src_prepare() { sed -i -e '/^ $(STRIP) ieee32.b/d' first/Makefile || die } +_emake() { + # We inject '-m32' / '-m elf32_sparc' to follow 'Rules.make' defaults. + + emake \ + HOSTCC="$(tc-getBUILD_CC)" \ + CC="$(tc-getCC) -m32" \ + STRIP="$(tc-getSTRIP)" \ + NM="$(tc-getNM)" \ + LD="$(tc-getLD) -m elf32_sparc" \ + TILO_ONLY=$(usex tilo-only yes no) + \ + "$@" +} + src_compile() { filter-flags "-fstack-protector" - CC="$(tc-getCC)" \ - STRIP="$(tc-getSTRIP)" \ - NM="$(tc-getNM)" \ - LD="$(tc-getLD)" \ - emake $(usex tilo-only '-C tilo' '') + _emake $(usex tilo-only '-C tilo' '') } src_install() { - default + _emake DESTDIR="${D}" install dodoc first-isofs/README.SILO_ISOFS docs/README* - - # Fix maketilo manpage - rm "${D}"/usr/share/man/man1/maketilo.1 - dosym tilo.1 /usr/share/man/man1/maketilo.1 } pkg_postinst() {