commit: d828e88d577641d4f0e22045df0c810443851f21
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 14:50:03 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:16 2020 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d828e88d
gkbuild.sh: _src_prepare(): Make sure that WANT_AUTORECONF=no will really skip
autoreconf
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
worker_modules/gkbuild.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index f26c27a..668bb8f 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
__module_main() {
@@ -401,6 +401,7 @@ _src_install() {
_src_prepare() {
# let's try to be smart and run autoreconf only when needed
+ # when no value was set in gkbuild
local want_autoreconf=${WANT_AUTORECONF}
# by default always run libtoolize
@@ -424,10 +425,11 @@ _src_prepare() {
-exec cksum {} + | sort -k2
}
- if $(uses_autoconf) && ! isTrue "${want_autoreconf}"
+ if [ -z "${want_autoreconf}" ] && $(uses_autoconf)
then
local checksum=$(at_checksum)
fi
+
if [[ -d "${patchdir}" ]]
then
local silent="-s "
@@ -465,7 +467,7 @@ _src_prepare() {
print_info 2 "$(get_indent 2)${P}: >> No patches found in
'$patchdir'; Skipping ..."
fi
- if $(uses_autoconf) && ! isTrue "${want_autoreconf}"
+ if [ -z "${want_autoreconf}" ] && $(uses_autoconf)
then
if [[ ${checksum} != $(at_checksum) ]]
then