From patchwork Fri Apr 3 05:11:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 21064 X-Patchwork-Delegate: mail@cbaines.net Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D61CA27BBE1; Fri, 3 Apr 2020 06:13:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 545C727BBE4 for ; Fri, 3 Apr 2020 06:13:16 +0100 (BST) Received: from localhost ([::1]:50246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKEdm-00085o-Ov for patchwork@mira.cbaines.net; Fri, 03 Apr 2020 01:13:15 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#40399] [PATCH] build-system/gnu: Allow overriding of bootstrap scripts. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Apr 2020 05:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40399 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40399@debbugs.gnu.org Cc: Ricardo Wurmus X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15858907601522 (code B ref -1); Fri, 03 Apr 2020 05:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2020 05:12:40 +0000 Received: from localhost ([127.0.0.1]:41061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKEdB-0000OM-V2 for submit@debbugs.gnu.org; Fri, 03 Apr 2020 01:12:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:38363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKEd8-0000O4-36 for submit@debbugs.gnu.org; Fri, 03 Apr 2020 01:12:36 -0400 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 ARC-Seal: i=1; a=rsa-sha256; t=1585890746; cv=none; d=zohomail.com; s=zohoarc; b=VSQ0pyUNumCYNiaVR4q5EnnwKU7MNIv28eq180c/GxRaesfVWPlOdnEf0oIqHjnaXboWE7kK5+It7L76/xmnueGOZbrsK3XzmUXrEmx44HnxFU6ym9eD1Pt/7JXorQ44lvrR6bEICghtXvOrxEpJ5ythw7TqbAu5i6jwuf7Gz/w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585890746; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=DHDpeoxtANrmwIbKDR27WPT+vp1Ptu2w/7HZSOE+Qsg=; b=GefcMZrJ0Ic7NCe8Cd0+lqcIawZgBp0uvg6GyLiAa9a0n8UeYvTZ+LT5omJJj2Gsou/acenQWwo2gtcA4rQyoLTSsG16J+NNfJCWy215WHZitdpmwVrakXRg7yXM1mAzClLMxpHdHq3kOxC37RhWgq9VqNdeDSHFkx8eSN7mEX4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1585890746; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Message-ID:Subject:Date:MIME-Version:Content-Transfer-Encoding:Content-Type; bh=DHDpeoxtANrmwIbKDR27WPT+vp1Ptu2w/7HZSOE+Qsg=; b=YZUOtNpWch3g9WTdDJbKKOlkfKp1QeMia4/Z4W25i3Y8ZynRg2Y6eITgpX1k8sMb J045o6ylcP0bdDxX8uX88X6QyI85mMQP32DH5b2C7XEosS+Y/mk97l4IFNn9V6NrGp2 5M45DKZeUwEgnBHRtvS7x70WVKO+bsMSQiiCFusM= Received: from localhost (p54AD4DDA.dip0.t-ipconnect.de [84.173.77.218]) by mx.zohomail.com with SMTPS id 1585890742894557.1037502533703; Thu, 2 Apr 2020 22:12:22 -0700 (PDT) From: Ricardo Wurmus Message-ID: <20200403051133.10138-1-rekado@elephly.net> Date: Fri, 3 Apr 2020 07:11:33 +0200 X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-ZohoMailClient: External X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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))?)$") +(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 '()) + (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) -(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."