From 1975eb868186fba89ce71397ecdeed5dfaad0c0b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 25 Dec 2020 22:21:27 +0000 Subject: 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 --- sys-boot/silo/silo-1.4.14_p20200602.ebuild | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'sys-boot') diff --git a/sys-boot/silo/silo-1.4.14_p20200602.ebuild b/sys-boot/silo/silo-1.4.14_p20200602.ebuild index deeed7b293d6..42f7fc372543 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() { -- cgit v1.2.3-65-gdbad