From 5d9fb1a5e06bd4902df8b2bd0992148957089e25 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Sun, 16 May 2021 18:32:42 +0100
Subject: dev-util/elfkickers: respect user's $(AR)

Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/724258
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 dev-util/elfkickers/elfkickers-3.1a.ebuild        | 10 +++++-----
 dev-util/elfkickers/files/elfkickers-3.1-AR.patch | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 dev-util/elfkickers/files/elfkickers-3.1-AR.patch

diff --git a/dev-util/elfkickers/elfkickers-3.1a.ebuild b/dev-util/elfkickers/elfkickers-3.1a.ebuild
index cc49c477cb5b..769f64eccd24 100644
--- a/dev-util/elfkickers/elfkickers-3.1a.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.1a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,14 +24,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-respect-CFLAGS-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-3.1-create-destdir-path.patch
 	"${FILESDIR}"/add-freebsd-elf-defs.patch
+	"${FILESDIR}"/${PN}-3.1-AR.patch
 )
 
 src_prepare() {
 	default
+
+	tc-export AR CC
+
 	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
 		|| die "sed failed"
 }
-
-src_compile() {
-	emake CC=$(tc-getCC) all
-}
diff --git a/dev-util/elfkickers/files/elfkickers-3.1-AR.patch b/dev-util/elfkickers/files/elfkickers-3.1-AR.patch
new file mode 100644
index 000000000000..6b5100c06eee
--- /dev/null
+++ b/dev-util/elfkickers/files/elfkickers-3.1-AR.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/724258
+--- a/ebfc/Makefile
++++ b/ebfc/Makefile
+@@ -10,7 +10,7 @@ brainfuck.o: brainfuck.c elfparts.h ebfc.h
+ 
+ libelfparts.a: elfparts.o ehdr.o phdrtab.o shdrtab.o progbits.o	\
+                strtab.o symtab.o hash.o rel.o got.o dynamic.o
+-	ar crs libelfparts.a $^
++	$(AR) crs libelfparts.a $^
+ 
+ elfparts.o: elfparts.c elfparts.h gen.h
+ ehdr.o: ehdr.c elfparts.h gen.h
+--- a/elfrw/Makefile
++++ b/elfrw/Makefile
+@@ -6,7 +6,7 @@ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
+           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
+ 
+ libelfrw.a: $(LIBOBJS)
+-	ar crs $@ $^
++	$(AR) crs $@ $^
+ 
+ elfrw.o: elfrw.c elfrw.h elfrw_int.h
+ elfrw_dyn.o: elfrw_dyn.c elfrw_int.h
-- 
cgit v1.2.3-65-gdbad