[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v4 core-updates 05/36] net-base: Fix cross-compilatio
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v4 core-updates 05/36] net-base: Fix cross-compilation, eliminating %build-inputs & friends |
Date: |
Sat, 19 Jun 2021 17:04:27 +0200 |
"source" is not in %build-inputs when cross-compiling, so another
approach for referring to the package source code is needed.
* gnu/packages/admin.scm (net-base)[arguments]<#:builder>: Eliminate
%build-inputs and %outputs.
---
gnu/packages/admin.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 230ba98b41..e54be5a672 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -941,10 +941,10 @@ to allow automatic login and starting any app.")
(use-modules (guix build utils)
(srfi srfi-26))
- (let* ((source (assoc-ref %build-inputs "source"))
- (tar (assoc-ref %build-inputs "tar"))
- (xz (assoc-ref %build-inputs "xz"))
- (output (assoc-ref %outputs "out"))
+ (let* ((source #+(package-source this-package))
+ (tar #+(this-package-native-input "tar"))
+ (xz #+(this-package-native-input "xz"))
+ (output #$output)
(etc (string-append output "/etc")))
(setenv "PATH" (string-append xz "/bin"))
(invoke (string-append tar "/bin/tar") "xvf"
--
2.32.0
- [bug#49025] [PATCH v3 core-updates 37/37] meson: Support cross-compilation., (continued)
- [bug#49025] [PATCH v3 core-updates 37/37] meson: Support cross-compilation., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 36/37] cross-base: Fix cross-compiler for i686-linux-gnu., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 24/37] readline: Fix build error when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 35/37] opendht: Correct 'nettle' variable name in inputs., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 13/37] wrap-python3: Make #:builder a G-exp instead of a raw S-exp., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 33/37] tk: Do not use %build-inputs when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v4 core-updates 00/36] Support cross-compilation with meson, Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 01/36] utils: Define target-linux? predicate., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 02/36] utils: Define a target-x86-32? and target-x86-64? predicate., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 05/36] net-base: Fix cross-compilation, eliminating %build-inputs & friends,
Maxime Devos <=
- [bug#49025] [PATCH v4 core-updates 04/36] net-base: Make #:builder argument a G-expression., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 06/36] net-base: Don't cross-compile., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 03/36] packages: Define this-package-input and this-package-native-input., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 08/36] libgpg-error: Remove trailing #f from phases., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 07/36] tzdata: Don't bother with cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 10/36] libgpgerror: Maybe fix a cross-compilation bug., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 11/36] libgpg-error: Fix cross-compilation error., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 13/36] wrap-python3: Make #:builder a G-exp instead of a raw S-exp., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 14/36] wrap-python3: Fix cross-compilation., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 17/36] openssl: Make the #:phases argument a G-expression., Maxime Devos, 2021/06/19