From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:53975) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKEdd-00081Q-58 for guix-patches@gnu.org; Fri, 03 Apr 2020 01:13:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKEda-0002vZ-Tf for guix-patches@gnu.org; Fri, 03 Apr 2020 01:13:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57748) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jKEda-0002vL-Qm for guix-patches@gnu.org; Fri, 03 Apr 2020 01:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jKEda-0000Pi-KQ for guix-patches@gnu.org; Fri, 03 Apr 2020 01:13:02 -0400 Subject: [bug#40399] [PATCH] build-system/gnu: Allow overriding of bootstrap scripts. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:53883) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKEd5-0007P9-Nn for guix-patches@gnu.org; Fri, 03 Apr 2020 01:12:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKEd3-00029s-LT for guix-patches@gnu.org; Fri, 03 Apr 2020 01:12:31 -0400 Received: from sender4-of-o53.zoho.com ([136.143.188.53]:21318) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jKEd3-00025r-88 for guix-patches@gnu.org; Fri, 03 Apr 2020 01:12:29 -0400 From: Ricardo Wurmus Message-ID: <20200403051133.10138-1-rekado@elephly.net> Date: Fri, 3 Apr 2020 07:11:33 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf8 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40399@debbugs.gnu.org Cc: Ricardo Wurmus * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Accept bootstrap-scripts keyword argument and pass it to gnu-build. (%bootstrap-scripts): New variable. * guix/build/gnu-build-system.scm (%bootstrap-scripts): Remove variable. (bootstrap): Remove default value for bootstrap-scripts argument. --- guix/build-system/gnu.scm | 8 ++++++++ guix/build/gnu-build-system.scm | 6 +----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 7266fa0009..f28d59cc5e 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -322,10 +322,15 @@ standard packages used as implicit inputs of the GNU = build system." ;; Regexp matching license files. "^(COPYING.*|LICEN[CS]E.*|[Ll]icen[cs]e.*|Copy[Rr]ight(\\.(txt|md))?)$") =20 +(define %bootstrap-scripts + ;; Typical names of Autotools "bootstrap" scripts. + '("bootstrap" "bootstrap.sh" "autogen.sh")) + (define* (gnu-build store name input-drvs #:key (guile #f) (outputs '("out")) (search-paths '()) + (bootstrap-scripts %bootstrap-scripts) (configure-flags ''()) (make-flags ''()) (out-of-source? #f) @@ -398,6 +403,7 @@ packages that must not be referenced." search-paths) #:phases ,phases #:locale ,locale + #:bootstrap-scripts ,bootstrap-scripts #:configure-flags ,configure-flags #:make-flags ,make-flags #:out-of-source? ,out-of-source? @@ -476,6 +482,7 @@ is one of `host' or `target'." (search-paths '()) (native-search-paths '()) =20 + (bootstrap-scripts %bootstrap-scripts) (configure-flags ''()) (make-flags ''()) (out-of-source? #f) @@ -557,6 +564,7 @@ platform." native-search-paths) #:phases ,phases #:locale ,locale + #:bootstrap-scripts ,bootstrap-scripts #:configure-flags ,configure-flags #:make-flags ,make-flags #:out-of-source? ,out-of-source? diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.= scm index 4df0bb4904..72a188955d 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -163,11 +163,7 @@ working directory." (chdir (first-subdirectory ".")))) #t) =20 -(define %bootstrap-scripts - ;; Typical names of Autotools "bootstrap" scripts. - '("bootstrap" "bootstrap.sh" "autogen.sh")) - -(define* (bootstrap #:key (bootstrap-scripts %bootstrap-scripts) +(define* (bootstrap #:key bootstrap-scripts #:allow-other-keys) "If the code uses Autotools and \"configure\" is missing, run \"autoreconf\". Otherwise do nothing." --=20 2.25.1