1 |
commit: e2418094a1aa5653cbaf3a88cb5d354f58a7032e |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 22 04:41:34 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 22 04:41:34 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2418094 |
7 |
|
8 |
net-analyzer/nmap: force -j1 again in src_install for now |
9 |
|
10 |
Apparently not fixed, or a new issue resurfaced anyway. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/831713 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
net-analyzer/nmap/nmap-7.92.ebuild | 4 +++- |
16 |
net-analyzer/nmap/nmap-9999.ebuild | 4 +++- |
17 |
2 files changed, 6 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild |
20 |
index 348adce730a5..8578d039870f 100644 |
21 |
--- a/net-analyzer/nmap/nmap-7.92.ebuild |
22 |
+++ b/net-analyzer/nmap/nmap-7.92.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2021 Gentoo Authors |
25 |
+# Copyright 1999-2022 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=7 |
29 |
@@ -121,7 +121,9 @@ src_compile() { |
30 |
} |
31 |
|
32 |
src_install() { |
33 |
+ # See bug #831713 for return of -j1 |
34 |
LC_ALL=C emake \ |
35 |
+ -j1 \ |
36 |
DESTDIR="${D}" \ |
37 |
STRIP=: \ |
38 |
nmapdatadir="${EPREFIX}"/usr/share/nmap \ |
39 |
|
40 |
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild |
41 |
index 466e9b414a06..e04fab825e5c 100644 |
42 |
--- a/net-analyzer/nmap/nmap-9999.ebuild |
43 |
+++ b/net-analyzer/nmap/nmap-9999.ebuild |
44 |
@@ -1,4 +1,4 @@ |
45 |
-# Copyright 1999-2021 Gentoo Authors |
46 |
+# Copyright 1999-2022 Gentoo Authors |
47 |
# Distributed under the terms of the GNU General Public License v2 |
48 |
|
49 |
EAPI=7 |
50 |
@@ -122,7 +122,9 @@ src_compile() { |
51 |
} |
52 |
|
53 |
src_install() { |
54 |
+ # See bug #831713 for return of -j1 |
55 |
LC_ALL=C emake \ |
56 |
+ -j1 \ |
57 |
DESTDIR="${D}" \ |
58 |
STRIP=: \ |
59 |
nmapdatadir="${EPREFIX}"/usr/share/nmap \ |