From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2J5zH5NAcl/QQQAA0tVLHw (envelope-from ) for ; Mon, 28 Sep 2020 19:59:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id Y/MRG5NAcl+UJwAAB5/wlQ (envelope-from ) for ; Mon, 28 Sep 2020 19:59:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E5BEA9403C6 for ; Mon, 28 Sep 2020 19:59:14 +0000 (UTC) Received: from localhost ([::1]:52766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMzIn-0004Rp-IV for larch@yhetil.org; Mon, 28 Sep 2020 15:59:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMzHg-0003f6-3l for guix-patches@gnu.org; Mon, 28 Sep 2020 15:58:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42555) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kMzHf-0005jJ-Q9 for guix-patches@gnu.org; Mon, 28 Sep 2020 15:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kMzHf-0002zE-Qn for guix-patches@gnu.org; Mon, 28 Sep 2020 15:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43679] [PATCH 5/5] guix build: Add '--with-toolchain'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Sep 2020 19:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43679 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43679@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 43679-submit@debbugs.gnu.org id=B43679.160132303511356 (code B ref 43679); Mon, 28 Sep 2020 19:58:03 +0000 Received: (at 43679) by debbugs.gnu.org; 28 Sep 2020 19:57:15 +0000 Received: from localhost ([127.0.0.1]:54084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMzGs-0002x0-I0 for submit@debbugs.gnu.org; Mon, 28 Sep 2020 15:57:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMzGm-0002w5-3w for 43679@debbugs.gnu.org; Mon, 28 Sep 2020 15:57:08 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51206) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMzGg-0005cA-Pg; Mon, 28 Sep 2020 15:57:02 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=43782 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kMzGg-0003Ee-0K; Mon, 28 Sep 2020 15:57:02 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Mon, 28 Sep 2020 21:56:48 +0200 Message-Id: <20200928195648.30256-5-ludo@gnu.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200928195648.30256-1-ludo@gnu.org> References: <20200928195648.30256-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.51 X-TUID: n6+yzYEDtY9a From: Ludovic Courtès * guix/scripts/build.scm (transform-package-toolchain): New procedure. (%transformations): Add it. (%transformation-options, show-transformation-options-help): Add '--with-toolchain'. * tests/scripts-build.scm ("options->transformation, with-toolchain"): New test. * doc/guix.texi (Package Transformation Options): Document it. --- doc/guix.texi | 29 +++++++++++++++++++++++++++++ guix/scripts/build.scm | 40 ++++++++++++++++++++++++++++++++++++++++ tests/scripts-build.scm | 30 ++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 03836bbf7b..049958b55f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9310,6 +9310,35 @@ must be compatible. If @var{replacement} is somehow incompatible with @var{package}, then the resulting package may be unusable. Use with care! +@cindex tool chain, changing the build tool chain of a package +@item --with-toolchain=@var{package}=@var{toolchain} +This option changes @var{package} so that it gets built with +@var{toolchain} instead of the default GNU tool chain for C/C++. + +Consider this example: + +@example +guix build octave-cli \ + --with-toolchain=fftw=gcc-toolchain@@10 \ + --with-toolchain=fftwf=gcc-toolchain@@10 +@end example + +The command above builds a variant of the @code{fftw} and @code{fftwf} +packages using version 10 of @code{gcc-toolchain} instead of the default +tool chain, and then builds a variant of the GNU@tie{}Octave +command-line interface using them. GNU@tie{}Octave itself is built +using the default tool chain. + +This other example builds the Hardware Locality (@code{hwloc}) library +with the Clang C compiler, and then builds its dependents up to +@code{intel-mpi-benchmarks} using the default tool chain, but linking +them against the Clang-built @code{hwloc}: + +@example +guix build --with-toolchain=hwloc=clang-toolchain \ + intel-mpi-benchmarks +@end example + @item --with-git-url=@var{package}=@var{url} @cindex Git, using the latest commit @cindex latest commit, building diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index f238e9b876..290046a808 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -393,6 +393,40 @@ a checkout of the Git repository at the given URL." (rewrite obj) obj))) +(define (transform-package-toolchain replacement-specs) + "Return a procedure that, when passed a package, changes its toolchain or +that of its dependencies according to REPLACEMENT-SPECS. REPLACEMENT-SPECS is +a list of strings like \"fftw=gcc-toolchain@10\" meaning that the package to +the left of the equal sign must be built with the toolchain to the right of +the equal sign." + (define split-on-commas + (cute string-tokenize <> (char-set-complement (char-set #\,)))) + + (define (specification->input spec) + (let ((package (specification->package spec))) + (list (package-name package) package))) + + (define replacements + (map (lambda (spec) + (match (string-tokenize spec %not-equal) + ((spec (= split-on-commas toolchain)) + (cons spec + (lambda (old) + (let ((toolchain (map specification->input toolchain))) + (package-with-toolchain old toolchain))))) + (_ + (leave (G_ "~a: invalid toolchain replacement specification~%") + spec)))) + replacement-specs)) + + (define rewrite + (package-input-rewriting/spec replacements)) + + (lambda (store obj) + (if (package? obj) + (rewrite obj) + obj))) + (define (transform-package-tests specs) "Return a procedure that, when passed a package, sets #:tests? #f in its 'arguments' field." @@ -423,6 +457,7 @@ a checkout of the Git repository at the given URL." (with-branch . ,transform-package-source-branch) (with-commit . ,transform-package-source-commit) (with-git-url . ,transform-package-source-git-url) + (with-toolchain . ,transform-package-toolchain) (without-tests . ,transform-package-tests))) (define %transformation-options @@ -444,6 +479,8 @@ a checkout of the Git repository at the given URL." (parser 'with-commit)) (option '("with-git-url") #t #f (parser 'with-git-url)) + (option '("with-toolchain") #t #f + (parser 'with-toolchain)) (option '("without-tests") #t #f (parser 'without-tests))))) @@ -466,6 +503,9 @@ a checkout of the Git repository at the given URL." (display (G_ " --with-git-url=PACKAGE=URL build PACKAGE from the repository at URL")) + (display (G_ " + --with-toolchain=PACKAGE=TOOLCHAIN + build package with TOOLCHAIN")) (display (G_ " --without-tests=PACKAGE build PACKAGE without running its tests"))) diff --git a/tests/scripts-build.scm b/tests/scripts-build.scm index 5f91360953..2dd1315722 100644 --- a/tests/scripts-build.scm +++ b/tests/scripts-build.scm @@ -22,6 +22,8 @@ #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix git-download) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) #:use-module (guix scripts build) #:use-module (guix ui) #:use-module (guix utils) @@ -30,6 +32,8 @@ #:use-module (gnu packages base) #:use-module (gnu packages busybox) #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-64)) @@ -270,6 +274,32 @@ ((("x" dep3)) (map package-source (list dep1 dep3)))))))))))) +(test-equal "options->transformation, with-toolchain" + '("gcc-toolchain") + (let* ((p (dummy-package "thingie" + (build-system gnu-build-system) + (inputs `(("foo" ,grep) + ("bar" ,(dummy-package "chbouib" + (build-system gnu-build-system) + (native-inputs `(("x" ,grep))))))))) + (t (options->transformation '((with-toolchain + . "chbouib=gcc-toolchain"))))) + (define toolchain-packages + '("gcc" "binutils" "glibc" "ld-wrapper")) + + (with-store store + (let ((new (t store p))) + (match (bag-build-inputs (package->bag new)) + ((("foo" _) ("bar" dep) (_ (= package-name packages) . _) ...) + (and (every (cut member <> packages) + toolchain-packages) + (match (bag-build-inputs (package->bag dep)) + ((("x" dep0) (_ (= package-name packages) . _) ...) + (and (eq? dep0 grep) ;this one is unchanged + (not (any (cut member <> packages) + toolchain-packages)) + (member "gcc-toolchain" packages))))))))))) + (test-assert "options->transformation, without-tests" (let* ((dep (dummy-package "dep")) (p (dummy-package "foo" -- 2.28.0