1 |
commit: d828e88d577641d4f0e22045df0c810443851f21 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 14 14:50:03 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 16 14:29:16 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d828e88d |
7 |
|
8 |
gkbuild.sh: _src_prepare(): Make sure that WANT_AUTORECONF=no will really skip autoreconf |
9 |
|
10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
11 |
|
12 |
worker_modules/gkbuild.sh | 8 +++++--- |
13 |
1 file changed, 5 insertions(+), 3 deletions(-) |
14 |
|
15 |
diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh |
16 |
index f26c27a..668bb8f 100644 |
17 |
--- a/worker_modules/gkbuild.sh |
18 |
+++ b/worker_modules/gkbuild.sh |
19 |
@@ -1,5 +1,5 @@ |
20 |
#!/bin/bash |
21 |
-# Copyright 1999-2019 Gentoo Authors |
22 |
+# Copyright 1999-2020 Gentoo Authors |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
__module_main() { |
26 |
@@ -401,6 +401,7 @@ _src_install() { |
27 |
|
28 |
_src_prepare() { |
29 |
# let's try to be smart and run autoreconf only when needed |
30 |
+ # when no value was set in gkbuild |
31 |
local want_autoreconf=${WANT_AUTORECONF} |
32 |
|
33 |
# by default always run libtoolize |
34 |
@@ -424,10 +425,11 @@ _src_prepare() { |
35 |
-exec cksum {} + | sort -k2 |
36 |
} |
37 |
|
38 |
- if $(uses_autoconf) && ! isTrue "${want_autoreconf}" |
39 |
+ if [ -z "${want_autoreconf}" ] && $(uses_autoconf) |
40 |
then |
41 |
local checksum=$(at_checksum) |
42 |
fi |
43 |
+ |
44 |
if [[ -d "${patchdir}" ]] |
45 |
then |
46 |
local silent="-s " |
47 |
@@ -465,7 +467,7 @@ _src_prepare() { |
48 |
print_info 2 "$(get_indent 2)${P}: >> No patches found in '$patchdir'; Skipping ..." |
49 |
fi |
50 |
|
51 |
- if $(uses_autoconf) && ! isTrue "${want_autoreconf}" |
52 |
+ if [ -z "${want_autoreconf}" ] && $(uses_autoconf) |
53 |
then |
54 |
if [[ ${checksum} != $(at_checksum) ]] |
55 |
then |