[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
25/58: gnu: openssl-1.1: Fix shared build for the Hurd.
From: |
guix-commits |
Subject: |
25/58: gnu: openssl-1.1: Fix shared build for the Hurd. |
Date: |
Wed, 19 Jul 2023 03:00:47 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 24c5765b8ffb4fa81158f48687140100f4e5d191
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Jun 11 20:47:14 2023 +0200
gnu: openssl-1.1: Fix shared build for the Hurd.
* gnu/packages/tls.scm (openssl-1.1)[arguments]: When building for the Hurd,
add phase 'patch-configure'.
(openssl)[arguments]: And delete it again.
---
gnu/packages/tls.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index a2ed15ebdc..f51c47db04 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -470,6 +470,13 @@ OpenSSL for TARGET."
#$(target->openssl-target
(%current-target-system))))))
#~())
+ #$@(if (target-hurd?)
+ #~((add-after 'unpack 'patch-configure
+ (lambda _
+ (substitute* "config"
+ (("case \"\\$GUESSOS\" in.*" all)
+ (string-append all "hurd-x86*)
OUT=hurd-x86;;\n"))))))
+ #~())
(replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys)
;; It's not a shebang so patch-source-shebangs misses it.
@@ -585,7 +592,10 @@ OpenSSL for TARGET."
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(setenv "HASHBANGPERL"
(search-input-file (or native-inputs inputs)
- "/bin/perl"))))))
+ "/bin/perl"))))
+ #$@(if (target-hurd?)
+ #~((delete 'patch-configure))
+ #~())))
((#:configure-flags flags #~'())
(if (system-hurd?)
#~(append #$flags '("hurd-x86")) ;must not be used when
- 27/58: gnu: tcsh: Skip substitution tests on the Hurd., (continued)
- 27/58: gnu: tcsh: Skip substitution tests on the Hurd., guix-commits, 2023/07/19
- 20/58: gnu: git: Skip failing test on the Hurd., guix-commits, 2023/07/19
- 32/58: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/19
- 34/58: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/07/19
- 02/58: gnu: guile: Skip hanging and failing pipe tests on the Hurd., guix-commits, 2023/07/19
- 56/58: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/07/19
- 48/58: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/07/19
- 55/58: DRAFT hurd-boot: Support second boot., guix-commits, 2023/07/19
- 17/58: gnu: libgcrypt: Skip hanging benchmark tests on the Hurd., guix-commits, 2023/07/19
- 11/58: gnu: python: Support native build on the Hurd., guix-commits, 2023/07/19
- 25/58: gnu: openssl-1.1: Fix shared build for the Hurd.,
guix-commits <=
- 31/58: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/07/19
- 36/58: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/07/19
- 37/58: gnu: pango: Support build for the Hurd., guix-commits, 2023/07/19
- 43/58: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/07/19
- 44/58: gnu: guix: Disable some test on 32bit., guix-commits, 2023/07/19
- 39/58: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/07/19
- 50/58: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/07/19
- 47/58: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/07/19
- 46/58: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/07/19
- 06/58: gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd., guix-commits, 2023/07/19