commit:     915705ee5db3fff848c1af34db5aa4a68320619b
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  6 03:35:27 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Oct  6 03:36:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=915705ee

app-crypt/efitools: do not call ar directly

Closes: https://bugs.gentoo.org/744919
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 app-crypt/efitools/efitools-1.8.1.ebuild        |  1 +
 app-crypt/efitools/efitools-1.9.2.ebuild        |  1 +
 app-crypt/efitools/files/1.8.1-respect-ar.patch | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild 
b/app-crypt/efitools/efitools-1.8.1.ebuild
index 3d0ff6e70f2..ebac350dbca 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
        "${FILESDIR}/1.7.0-Make.rules.patch"
+       "${FILESDIR}/1.8.1-respect-ar.patch"
 )
 
 src_prepare() {

diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild 
b/app-crypt/efitools/efitools-1.9.2.ebuild
index 2f10592f3b1..ac731ef3bd0 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
        "${FILESDIR}/1.7.0-Make.rules.patch"
+       "${FILESDIR}/1.8.1-respect-ar.patch"
 )
 
 src_prepare() {

diff --git a/app-crypt/efitools/files/1.8.1-respect-ar.patch 
b/app-crypt/efitools/files/1.8.1-respect-ar.patch
new file mode 100644
index 00000000000..36e6620119f
--- /dev/null
+++ b/app-crypt/efitools/files/1.8.1-respect-ar.patch
@@ -0,0 +1,25 @@
+From 81503d7a43b99c036758d05c1794502c09189fa4 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <[email protected]>
+Date: Tue, 5 Oct 2021 22:27:52 -0500
+Subject: [PATCH] Do not use ar directly
+
+---
+ Make.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Make.rules b/Make.rules
+index e46d407..767070d 100644
+--- a/Make.rules
++++ b/Make.rules
+@@ -129,7 +129,7 @@ getvar = $(shell if [ "$(1)" = "PK" -o "$(1)" = "KEK" ]; 
then echo $(1); else ec
+ #     sbsign --key KEK.key --cert KEK.crt --output $@ $<
+ 
+ %.a:
+-      ar rcv $@ $^
++      $(AR) rcv $@ $^
+ 
+ doc/%.1: doc/%.1.in %
+       $(HELP2MAN) --no-info -i $< -o $@ ./$*
+-- 
+2.32.0
+

Reply via email to