me/guix
Archived
1
0
Fork 0
Code Activity

openssl: Extract logic for computing CONFIGURE_TARGET_ARCH.

Browse source 
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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Maxime Devos 2021-07-14 13:13:02 +02:00 • committed by Mathieu Othacehe
parent 3e42c2bfbb
commit 7fabe9c845
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 27 additions and 19 deletions

46
gnu/packages/tls.scm
View file

@ -311,6 +311,31 @@ required structures.")
(define-public guile3.0-gnutls (define-public guile3.0-gnutls
(deprecated-package "guile3.0-gnutls" 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 (define-public openssl
(package (package
(name "openssl") (name "openssl")
@ -349,25 +374,8 @@ required structures.")
(lambda* (#:key target #:allow-other-keys) (lambda* (#:key target #:allow-other-keys)
(setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CROSS_COMPILE" (string-append target "-"))
(setenv "CONFIGURE_TARGET_ARCH" (setenv "CONFIGURE_TARGET_ARCH"
(cond #$(target->openssl-target
((string-prefix? "i586" target) (%current-target-system))))))
"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"))))))
#~()) #~())
(replace 'configure (replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys) (lambda* (#:key configure-flags #:allow-other-keys)