1 |
commit: be85a7b83178e93eab93f2d415d581da0c43426a |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 2 19:16:34 2022 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 2 19:16:34 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be85a7b8 |
7 |
|
8 |
mail-client/s-nail: Fix building with sys-devel/make-4.4 |
9 |
|
10 |
The config target saves MAKEFLAGS to a file and this is referenced incorrectly |
11 |
later. make 4.4 could then look for a jobserver file that no longer exists |
12 |
if -j > 1. |
13 |
|
14 |
Run make directly instead of emake to avoid pollution in config. |
15 |
|
16 |
Closes: https://bugs.gentoo.org/879065 |
17 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
18 |
|
19 |
mail-client/s-nail/s-nail-14.9.22.ebuild | 3 ++- |
20 |
mail-client/s-nail/s-nail-14.9.24.ebuild | 5 +++-- |
21 |
2 files changed, 5 insertions(+), 3 deletions(-) |
22 |
|
23 |
diff --git a/mail-client/s-nail/s-nail-14.9.22.ebuild b/mail-client/s-nail/s-nail-14.9.22.ebuild |
24 |
index dd455d2c17f5..822c7e20fc58 100644 |
25 |
--- a/mail-client/s-nail/s-nail-14.9.22.ebuild |
26 |
+++ b/mail-client/s-nail/s-nail-14.9.22.ebuild |
27 |
@@ -57,7 +57,8 @@ src_configure() { |
28 |
|
29 |
tc-is-cross-compiler && confopts+=( OPT_CROSS_BUILD=yes ) |
30 |
|
31 |
- emake "${confopts[@]}" config |
32 |
+ # Cannot use emake or bad options saved Bug 879065 |
33 |
+ make "${confopts[@]}" config || die |
34 |
} |
35 |
|
36 |
src_compile() { |
37 |
|
38 |
diff --git a/mail-client/s-nail/s-nail-14.9.24.ebuild b/mail-client/s-nail/s-nail-14.9.24.ebuild |
39 |
index 04362d1fe000..919009f5d74b 100644 |
40 |
--- a/mail-client/s-nail/s-nail-14.9.24.ebuild |
41 |
+++ b/mail-client/s-nail/s-nail-14.9.24.ebuild |
42 |
@@ -57,11 +57,12 @@ src_configure() { |
43 |
|
44 |
tc-is-cross-compiler && confopts+=( OPT_CROSS_BUILD=yes ) |
45 |
|
46 |
- emake "${confopts[@]}" config |
47 |
+ # Cannot use emake or bad options saved Bug 879065 |
48 |
+ make "${confopts[@]}" config || die |
49 |
} |
50 |
|
51 |
src_compile() { |
52 |
- emake build |
53 |
+ TMPDIR=/tmp emake build |
54 |
} |
55 |
|
56 |
src_install() { |