diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-06-06 21:37:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-06-06 23:28:48 +0200 |
| commit | b49caaa2b7f624c3395c8e872638282bcc420502 (patch) | |
| tree | 8507bbf825fb3dabc155f5f526e63cd39397fcbb /tests/packages.scm | |
| parent | 58bb833365db4e8934a386497d5b00a063cfd27d (diff) | |
| download | guix-b49caaa2b7f624c3395c8e872638282bcc420502.tar guix-b49caaa2b7f624c3395c8e872638282bcc420502.tar.gz | |
packages: Make 'bag-grafts' insensitive to '%current-target-system'.
Fixes <https://bugs.gnu.org/41713>.
Reported by Mathieu Othacehe.
* guix/packages.scm (bag-grafts): Wrap 'fold-bag-dependencies' calls in
'parameterize'.
* tests/packages.scm ("package->bag, sensitivity to
%current-target-system"): New test.
Diffstat (limited to 'tests/packages.scm')
| -rw-r--r-- | tests/packages.scm | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/tests/packages.scm b/tests/packages.scm index d8f0d677a3..72e87dbfb7 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -1006,6 +1006,39 @@ (assoc-ref (bag-build-inputs bag) "libc") (assoc-ref (bag-build-inputs bag) "coreutils")))) +(test-assert "package->bag, sensitivity to %current-target-system" + ;; https://bugs.gnu.org/41713 + (let* ((lower (lambda* (name #:key system target inputs native-inputs + #:allow-other-keys) + (and (not target) + (bag (name name) (system system) (target target) + (build-inputs native-inputs) + (host-inputs inputs) + (build (lambda* (store name inputs + #:key system target + #:allow-other-keys) + (build-expression->derivation + store "foo" '(mkdir %output)))))))) + (bs (build-system + (name 'build-system-without-cross-compilation) + (description "Does not support cross compilation.") + (lower lower))) + (dep (dummy-package "dep" (build-system bs))) + (pkg (dummy-package "example" + (native-inputs `(("dep" ,dep))))) + (do-not-build (lambda (continue store lst . _) lst))) + (equal? (with-build-handler do-not-build + (parameterize ((%current-target-system "powerpc64le-linux-gnu") + (%graft? #t)) + (package-cross-derivation %store pkg + (%current-target-system) + #:graft? #t))) + (with-build-handler do-not-build + (package-cross-derivation %store + (package (inherit pkg)) + "powerpc64le-linux-gnu" + #:graft? #t))))) + (test-equal "package->bag, cross-compilation" `(,(%current-system) "foo86-hurd" (,(package-source gnu-make)) |