| 1 |
commit: 5d9fb1a5e06bd4902df8b2bd0992148957089e25 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 16 17:32:42 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 16 17:37:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9fb1a5 |
| 7 |
|
| 8 |
dev-util/elfkickers: respect user's $(AR) |
| 9 |
|
| 10 |
Reported-by: Agostino Sarubbo |
| 11 |
Closes: https://bugs.gentoo.org/724258 |
| 12 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/elfkickers/elfkickers-3.1a.ebuild | 10 +++++----- |
| 16 |
dev-util/elfkickers/files/elfkickers-3.1-AR.patch | 23 +++++++++++++++++++++++ |
| 17 |
2 files changed, 28 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-util/elfkickers/elfkickers-3.1a.ebuild b/dev-util/elfkickers/elfkickers-3.1a.ebuild |
| 20 |
index cc49c477cb5..769f64eccd2 100644 |
| 21 |
--- a/dev-util/elfkickers/elfkickers-3.1a.ebuild |
| 22 |
+++ b/dev-util/elfkickers/elfkickers-3.1a.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2019 Gentoo Authors |
| 25 |
+# Copyright 1999-2021 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
@@ -24,14 +24,14 @@ PATCHES=( |
| 30 |
"${FILESDIR}"/${PN}-3.1-respect-CFLAGS-LDFLAGS.patch |
| 31 |
"${FILESDIR}"/${PN}-3.1-create-destdir-path.patch |
| 32 |
"${FILESDIR}"/add-freebsd-elf-defs.patch |
| 33 |
+ "${FILESDIR}"/${PN}-3.1-AR.patch |
| 34 |
) |
| 35 |
|
| 36 |
src_prepare() { |
| 37 |
default |
| 38 |
+ |
| 39 |
+ tc-export AR CC |
| 40 |
+ |
| 41 |
sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \ |
| 42 |
|| die "sed failed" |
| 43 |
} |
| 44 |
- |
| 45 |
-src_compile() { |
| 46 |
- emake CC=$(tc-getCC) all |
| 47 |
-} |
| 48 |
|
| 49 |
diff --git a/dev-util/elfkickers/files/elfkickers-3.1-AR.patch b/dev-util/elfkickers/files/elfkickers-3.1-AR.patch |
| 50 |
new file mode 100644 |
| 51 |
index 00000000000..6b5100c06ee |
| 52 |
--- /dev/null |
| 53 |
+++ b/dev-util/elfkickers/files/elfkickers-3.1-AR.patch |
| 54 |
@@ -0,0 +1,23 @@ |
| 55 |
+https://bugs.gentoo.org/724258 |
| 56 |
+--- a/ebfc/Makefile |
| 57 |
++++ b/ebfc/Makefile |
| 58 |
+@@ -10,7 +10,7 @@ brainfuck.o: brainfuck.c elfparts.h ebfc.h |
| 59 |
+ |
| 60 |
+ libelfparts.a: elfparts.o ehdr.o phdrtab.o shdrtab.o progbits.o \ |
| 61 |
+ strtab.o symtab.o hash.o rel.o got.o dynamic.o |
| 62 |
+- ar crs libelfparts.a $^ |
| 63 |
++ $(AR) crs libelfparts.a $^ |
| 64 |
+ |
| 65 |
+ elfparts.o: elfparts.c elfparts.h gen.h |
| 66 |
+ ehdr.o: ehdr.c elfparts.h gen.h |
| 67 |
+--- a/elfrw/Makefile |
| 68 |
++++ b/elfrw/Makefile |
| 69 |
+@@ -6,7 +6,7 @@ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \ |
| 70 |
+ elfrw_shdr.o elfrw_sym.o elfrw_ver.o |
| 71 |
+ |
| 72 |
+ libelfrw.a: $(LIBOBJS) |
| 73 |
+- ar crs $@ $^ |
| 74 |
++ $(AR) crs $@ $^ |
| 75 |
+ |
| 76 |
+ elfrw.o: elfrw.c elfrw.h elfrw_int.h |
| 77 |
+ elfrw_dyn.o: elfrw_dyn.c elfrw_int.h |
Archives