[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
37/67: gnu: openssl-1.1: Fix shared build for the Hurd.
From: |
guix-commits |
Subject: |
37/67: gnu: openssl-1.1: Fix shared build for the Hurd. |
Date: |
Tue, 18 Jul 2023 09:27:17 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 92b4318e6dc37e7acd00844c630826c39b5c44e9
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 e8ed0d61a4..021c125983 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 (target-hurd? (%current-system))
#~(append
- branch hurd-team created (now dbe220f05d), guix-commits, 2023/07/18
- 17/67: gnu: m4: Skip gnulib stack-overflow tests for the Hurd., guix-commits, 2023/07/18
- 16/67: gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd., guix-commits, 2023/07/18
- 18/67: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/07/18
- 03/67: gnu: commencement: Add git-fetch-from-tarball utility., guix-commits, 2023/07/18
- 32/67: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/07/18
- 37/67: gnu: openssl-1.1: Fix shared build for the Hurd.,
guix-commits <=
- 46/67: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/07/18
- 52/67: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/07/18
- 10/67: gnu: guile: Skip hanging and failing pipe tests on the Hurd., guix-commits, 2023/07/18
- 15/67: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd., guix-commits, 2023/07/18
- 22/67: gnu: mpfr: Skip failing test on the Hurd., guix-commits, 2023/07/18
- 13/67: Revert "gnu: sed: Skip failing test on GNU/Hurd.", guix-commits, 2023/07/18
- 08/67: gnu: mig: Update to 1.8+git20230520., guix-commits, 2023/07/18
- 27/67: gnu: libgcrypt: Skip hanging benchmark tests on the Hurd., guix-commits, 2023/07/18
- 31/67: gnu: emacs: Depend on libc-for-target., guix-commits, 2023/07/18
- 35/67: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/07/18