[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v6 13/22] openssl: Make the #:phases argument a G-exp
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v6 13/22] openssl: Make the #:phases argument a G-expression. |
Date: |
Wed, 14 Jul 2021 13:12:58 +0200 |
This allows using this-package-native-input later.
* gnu/packages/tls.scm
(openssl)[arguments]<#:phases>: Make this a G-expression.
(openssl-1.0)[arguments]<#:phases>: Likewise.
---
gnu/packages/tls.scm | 42 ++++++++++++++++++++++--------------------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 8a8fcb59fd..0024709a96 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -40,6 +40,7 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
+ #:use-module (guix gexp)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system perl)
@@ -339,9 +340,10 @@ required structures.")
;; so we explicitly disallow it here.
#:disallowed-references ,(list (canonical-package perl))
#:phases
+ ,#~
(modify-phases %standard-phases
- ,@(if (%current-target-system)
- '((add-before
+ #$@(if (%current-target-system)
+ #~((add-before
'configure 'set-cross-compile
(lambda* (#:key target outputs #:allow-other-keys)
(setenv "CROSS_COMPILE" (string-append target "-"))
@@ -365,7 +367,7 @@ required structures.")
"linux-ppc64")
((string-prefix? "powerpc" target)
"linux-ppc"))))))
- '())
+ #~())
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -375,9 +377,9 @@ required structures.")
(("/usr/bin/env")
(string-append (assoc-ref %build-inputs "coreutils")
"/bin/env")))
- (invoke ,@(if (%current-target-system)
- '("./Configure")
- '("./config"))
+ (invoke #$@(if (%current-target-system)
+ #~("./Configure")
+ #~("./config"))
"shared" ;build shared libraries
"--libdir=lib"
@@ -386,13 +388,13 @@ required structures.")
;; conventional.
(string-append "--openssldir=" out
"/share/openssl-"
- ,(package-version this-package))
+ #$(package-version this-package))
(string-append "--prefix=" out)
(string-append "-Wl,-rpath," lib)
- ,@(if (%current-target-system)
- '((getenv "CONFIGURE_TARGET_ARCH"))
- '())))))
+ #$@(if (%current-target-system)
+ #~((getenv "CONFIGURE_TARGET_ARCH"))
+ #~())))))
(add-after 'install 'move-static-libraries
(lambda* (#:key outputs #:allow-other-keys)
;; Move static libraries to the "static" output.
@@ -424,7 +426,7 @@ required structures.")
;; scripts. Remove them to avoid retaining a reference on Perl.
(let ((out (assoc-ref outputs "out")))
(delete-file-recursively (string-append out "/share/openssl-"
- ,(package-version
this-package)
+ #$(package-version
this-package)
"/misc"))))))))
(native-search-paths
(list (search-path-specification
@@ -469,7 +471,7 @@ required structures.")
;; Parallel build is not supported in 1.0.x.
((#:parallel-build? _ #f) #f)
((#:phases phases)
- `(modify-phases ,phases
+ #~(modify-phases #$phases
(add-before 'patch-source-shebangs 'patch-tests
(lambda* (#:key inputs native-inputs #:allow-other-keys)
(let ((bash (assoc-ref (or native-inputs inputs) "bash")))
@@ -492,9 +494,9 @@ required structures.")
;; Override this phase because OpenSSL 1.0 does not understand
-rpath.
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
- (invoke ,@(if (%current-target-system)
- '("./Configure")
- '("./config"))
+ (invoke #$@(if (%current-target-system)
+ #~("./Configure")
+ #~("./config"))
"shared" ;build shared libraries
"--libdir=lib"
@@ -502,12 +504,12 @@ required structures.")
;; PREFIX/ssl. Change that to something more
;; conventional.
(string-append "--openssldir=" out
- "/share/openssl-" ,version)
+ "/share/openssl-" #$version)
(string-append "--prefix=" out)
- ,@(if (%current-target-system)
- '((getenv "CONFIGURE_TARGET_ARCH"))
- '())))))
+ #$@(if (%current-target-system)
+ '((getenv "CONFIGURE_TARGET_ARCH"))
+ '())))))
(delete 'move-extra-documentation)
(add-after 'install 'move-man3-pages
(lambda* (#:key outputs #:allow-other-keys)
@@ -532,7 +534,7 @@ required structures.")
;; scripts. Remove them to avoid retaining a reference on Perl.
(let ((out (assoc-ref outputs "out")))
(delete-file-recursively (string-append out "/share/openssl-"
- ,version "/misc"))
+ #$version "/misc"))
#t)))))))))
(define-public libressl
--
2.32.0
- [bug#49025] [PATCH v6 12/22] openssl: Remove trailing #t from phases., (continued)
- [bug#49025] [PATCH v6 12/22] openssl: Remove trailing #t from phases., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 19/22] glib: Verify the cross-compiled python is used in installed scripts., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 01/22] utils: Define 'target-linux?' predicate., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 04/22] utils: Define a target-x86-32? and target-x86-64? predicate., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 11/22] python: Fix reference to input when cross-compiling., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 18/22] glib: Use a correct python in scripts when cross-compiling., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 20/22] glib: Look up "tzdata" in 'native-inputs', not 'inputs'., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 07/22] tzdata: Don't bother with cross-compiling., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 06/22] net-base: Don't cross-compile., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 09/22] libgpg-error: Prevent silent miscompilation some systems., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 13/22] openssl: Make the #:phases argument a G-expression.,
Maxime Devos <=
- [bug#49025] [PATCH v6 16/22] openssl: Move all man pages to separate output, not only man3., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 15/22] openssl: Move documentation instead of copying and deleting it., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 14/22] openssl: Use G-exp machinery for referring to outputs., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 17/22] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 22/22] build-system/meson: Support cross-compilation., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 21/22] libelf: Update configure script and config.guess and config.sub., Maxime Devos, 2021/07/14