[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/43: gnu: openssl-1.1: Fix shared build for the Hurd.
From: |
guix-commits |
Subject: |
26/43: gnu: openssl-1.1: Fix shared build for the Hurd. |
Date: |
Thu, 20 Jul 2023 04:22:28 -0400 (EDT) |
janneke pushed a commit to branch master
in repository guix.
commit fb6f94864d1c1b3a6c46f3b880b8a51003854f89
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
- 07/43: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd., (continued)
- 07/43: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd., guix-commits, 2023/07/20
- 12/43: gnu: mpfr: Skip failing test on the Hurd., guix-commits, 2023/07/20
- 13/43: gnu: elfutils: Skip failing tests on the Hurd., guix-commits, 2023/07/20
- 14/43: gnu: libbsd: Skip failing test on the Hurd., guix-commits, 2023/07/20
- 18/43: gnu: tcl: Remove failing tests on the Hurd.., guix-commits, 2023/07/20
- 21/43: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/07/20
- 22/43: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/07/20
- 23/43: gnu: parted: Disable tests for the Hurd., guix-commits, 2023/07/20
- 24/43: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/07/20
- 25/43: gnu: cairo: Support building for the Hurd., guix-commits, 2023/07/20
- 26/43: gnu: openssl-1.1: Fix shared build for the Hurd.,
guix-commits <=
- 27/43: gnu: ruby-2.6: Skip test on the Hurd., guix-commits, 2023/07/20
- 28/43: gnu: tcsh: Skip substitution tests on the Hurd., guix-commits, 2023/07/20
- 32/43: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/07/20
- 33/43: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/20
- 15/43: gnu: c-ares: Skip failing tests on the Hurd., guix-commits, 2023/07/20
- 29/43: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/07/20
- 39/43: gnu: pango: Support build for the Hurd., guix-commits, 2023/07/20
- 19/43: gnu: curl: Skip failing test on the Hurd., guix-commits, 2023/07/20
- 30/43: gnu: zstd: Skip tests when building for the Hurd., guix-commits, 2023/07/20
- 35/43: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/07/20