1 |
commit: c9b663c6de96b2d326bdfe9afdbe04c7954806a0 |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 6 18:45:26 2021 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 6 18:48:17 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b663c6 |
7 |
|
8 |
app-cdr/isomaster: Respect variable AR |
9 |
|
10 |
Closes: https://bugs.gentoo.org/740138 |
11 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
12 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
13 |
|
14 |
app-cdr/isomaster/files/isomaster-1.3.15-ar.patch | 25 +++++++++++++++++++++++ |
15 |
app-cdr/isomaster/isomaster-1.3.15.ebuild | 5 +++-- |
16 |
2 files changed, 28 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch b/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..12c5ef4c362 |
21 |
--- /dev/null |
22 |
+++ b/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch |
23 |
@@ -0,0 +1,25 @@ |
24 |
+From 1553ea30148f69bce545b3a79ab3f7847566c50a Mon Sep 17 00:00:00 2001 |
25 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
26 |
+Date: Sat, 6 Feb 2021 19:36:33 +0100 |
27 |
+Subject: [PATCH] Makefile: Give external AR="$(tc-getAR)" a chance to win |
28 |
+ |
29 |
+--- |
30 |
+ Makefile | 2 +- |
31 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
32 |
+ |
33 |
+diff --git a/Makefile b/Makefile |
34 |
+index f005099..98808f8 100644 |
35 |
+--- a/Makefile |
36 |
++++ b/Makefile |
37 |
+@@ -48,7 +48,7 @@ OPTFLAGS ?= -Wall |
38 |
+ |
39 |
+ # programs used in the Makefiles: |
40 |
+ export CC ?= gcc |
41 |
+-export AR = ar |
42 |
++export AR ?= ar |
43 |
+ export RM = rm -f |
44 |
+ export INSTALL = install |
45 |
+ export CP = cp |
46 |
+-- |
47 |
+2.30.0 |
48 |
+ |
49 |
|
50 |
diff --git a/app-cdr/isomaster/isomaster-1.3.15.ebuild b/app-cdr/isomaster/isomaster-1.3.15.ebuild |
51 |
index 4409476a71a..f9907cc82e0 100644 |
52 |
--- a/app-cdr/isomaster/isomaster-1.3.15.ebuild |
53 |
+++ b/app-cdr/isomaster/isomaster-1.3.15.ebuild |
54 |
@@ -1,4 +1,4 @@ |
55 |
-# Copyright 1999-2020 Gentoo Authors |
56 |
+# Copyright 1999-2021 Gentoo Authors |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
|
59 |
EAPI=7 |
60 |
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND} |
61 |
|
62 |
PATCHES=( |
63 |
"${FILESDIR}"/${PN}-1.3.14-include-path.patch |
64 |
+ "${FILESDIR}"/${PN}-1.3.15-ar.patch |
65 |
) |
66 |
|
67 |
pkg_setup() { |
68 |
@@ -43,7 +44,7 @@ src_prepare() { |
69 |
} |
70 |
|
71 |
src_compile() { |
72 |
- tc-export CC |
73 |
+ tc-export AR CC |
74 |
emake "${myisoconf[@]}" |
75 |
} |