[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v4 core-updates 22/36] openssl: Extract logic for com
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v4 core-updates 22/36] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH. |
Date: |
Sat, 19 Jun 2021 17:04:44 +0200 |
By computing this value outside the build code, new targets
can be added without causing rebuilds for other targets.
* gnu/packages/tls.scm
(target->openssl-target): New procedure.
(openssl)[arguments]<#:phases>{set-cross-compile}: Use it.
---
gnu/packages/tls.scm | 46 ++++++++++++++++++++++++++------------------
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 72a1cd8f0c..1ed43f0ebd 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -310,6 +310,31 @@ required structures.")
(define-public guile3.0-gnutls
(deprecated-package "guile3.0-gnutls" gnutls))
+(define (target->openssl-target target)
+ "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling
+OpenSSL for TARGET."
+ ;; Keep this code outside the build code,
+ ;; such that new targets can be added
+ ;; without causing rebuilds for other targets.
+ (cond ((string-prefix? "i586" target)
+ "hurd-x86")
+ ((string-prefix? "i686" target)
+ "linux-x86")
+ ((string-prefix? "x86_64" target)
+ "linux-x86_64")
+ ((string-prefix? "mips64el" target)
+ "linux-mips64")
+ ((string-prefix? "arm" target)
+ "linux-armv4")
+ ((string-prefix? "aarch64" target)
+ "linux-aarch64")
+ ((string-prefix? "powerpc64le" target)
+ "linux-ppc64le")
+ ((string-prefix? "powerpc64" target)
+ "linux-ppc64")
+ ((string-prefix? "powerpc" target)
+ "linux-ppc")))
+
(define-public openssl
(package
(name "openssl")
@@ -348,25 +373,8 @@ required structures.")
(lambda* (#:key target #:allow-other-keys)
(setenv "CROSS_COMPILE" (string-append target "-"))
(setenv "CONFIGURE_TARGET_ARCH"
- (cond
- ((string-prefix? "i586" target)
- "hurd-x86")
- ((string-prefix? "i686" target)
- "linux-x86")
- ((string-prefix? "x86_64" target)
- "linux-x86_64")
- ((string-prefix? "mips64el" target)
- "linux-mips64")
- ((string-prefix? "arm" target)
- "linux-armv4")
- ((string-prefix? "aarch64" target)
- "linux-aarch64")
- ((string-prefix? "powerpc64le" target)
- "linux-ppc64le")
- ((string-prefix? "powerpc64" target)
- "linux-ppc64")
- ((string-prefix? "powerpc" target)
- "linux-ppc"))))))
+ #$(target->openssl-target
+ (%current-target-system))))))
#~())
(replace 'configure
(lambda _
--
2.32.0
- [bug#49025] [PATCH v4 core-updates 13/36] wrap-python3: Make #:builder a G-exp instead of a raw S-exp., (continued)
- [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
- [bug#49025] [PATCH v4 core-updates 24/36] readline: Fix build error when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 30/36] glib: Verify the cross-compiled python is used in installed scripts., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 28/36] fontconfig: Fix build error when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 29/36] glib: Use a correct python in scripts when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 19/36] openssl: Move documentation instead of copying and deleting it., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 27/36] fontconfig: Make the #:configure-flags argument a G-expression., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 31/36] glib: Look up "tzdata" in 'native-inputs', not 'inputs'., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 22/36] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH.,
Maxime Devos <=
- [bug#49025] [PATCH v4 core-updates 36/36] meson: Support cross-compilation., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 12/36] libgcrypt: Fix cross-compilation build error., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 15/36] python: Fix reference to input when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 16/36] openssl: Remove trailing #t from phases., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 18/36] openssl: Use G-exp machinery for referring to outputs., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 20/36] openssl: Move all man pages to separate output, not only man3., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 09/36] libgpg-error: Prevent silent miscompilation some systems., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 21/36] openssl: Find bin/env when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 35/36] cross-base: Fix cross-compiler for i686-linux-gnu., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 33/36] tk: Do not use %build-inputs when cross-compiling., Maxime Devos, 2021/06/19