commit: 8408b03ac54f257822ef6a180ec7dd7fe46167f3 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Fri Jul 1 15:35:44 2022 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Fri Jul 1 15:36:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8408b03a
sys-apps/memtest86+: fix direct objcopy call, re-organize seds Closes: https://bugs.gentoo.org/855167 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild index add994f6a7ec..9738d6afa80e 100644 --- a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild +++ b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit mount-boot +inherit mount-boot toolchain-funcs MY_PV=${PV/_/-} @@ -29,12 +29,17 @@ BDEPEND=" S=${WORKDIR}/memtest86plus-${MY_PV} src_prepare() { - sed -i -e "s#/sbin/mkdosfs#mkfs.vfat#" build{32,64}/Makefile || die - sed -i -e "s/^AS = as/AS +=/" -e "/^CC/d" build{32,64}/Makefile || die + sed -i \ + -e 's#/sbin/mkdosfs#mkfs.vfat#' \ + -e 's/^AS = as/AS +=/' \ + -e '/^CC/d' \ + -e 's/objcopy/$(OBJCOPY)/' \ + build{32,64}/Makefile || die default } src_compile() { + tc-export OBJCOPY pushd build32 use bios32 && emake memtest.bin use efi32 && emake memtest.efi
