[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [[PATCH v2 core-updates] 05/37] net-base: Fix cross-compilat
From: |
Maxime Devos |
Subject: |
[bug#49025] [[PATCH v2 core-updates] 05/37] net-base: Fix cross-compilation, eliminating %build-inputs & friends |
Date: |
Fri, 18 Jun 2021 18:09:04 +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 5c7e41f51b..f499a1252b 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 v2 core-updates] 01/37] utils: Define target-linux? predicate., (continued)
- [bug#49025] [[PATCH v2 core-updates] 01/37] utils: Define target-linux? predicate., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 02/37] utils: Define a target-x86-32? and target-x86-64? predicate., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 03/37] packages: Define this-package-input and this-package-native-input., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 08/37] libgpg-error: Remove trailing #f from phases., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 06/37] net-base: Don't cross-compile., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 09/37] libgpg-error: Prevent silent miscompilation some systems., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 12/37] libgcrypt: Fix cross-compilation build error., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 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 v2 core-updates] 17/37] openssl: Make the #:phases argument a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 22/37] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 05/37] net-base: Fix cross-compilation, eliminating %build-inputs & friends,
Maxime Devos <=
- [bug#49025] [[PATCH v2 core-updates] 04/37] net-base: Make #:builder argument a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 07/37] tzdata: Don't bother with cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 10/37] libgpgerror: Maybe fix a cross-compilation bug., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 16/37] openssl: Remove trailing #t from phases., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 18/37] openssl: Use G-exp machinery for referring to outputs., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 19/37] openssl: Move documentation instead of copying and deleting it., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 21/37] openssl: Find bin/env when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 23/37] readline: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 25/37] bash: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 34/37] libelf: Use the cross-compiler when cross-compiling., Maxime Devos, 2021/06/18