[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
64/89: gnu: openssl-1.1: Fix shared build for the Hurd.
From: |
guix-commits |
Subject: |
64/89: gnu: openssl-1.1: Fix shared build for the Hurd. |
Date: |
Tue, 20 Jun 2023 05:59:00 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 0cf59b6a427471638616f5f7b36793aefe1597d0
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 30c9396a7c..1806abd2d5 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
- 23/89: bootloader: grub: Use rumpdisk-style root when booting with "noide"., (continued)
- 23/89: bootloader: grub: Use rumpdisk-style root when booting with "noide"., guix-commits, 2023/06/20
- 15/89: gnu: hurd: Update libpciaccess to 0.17., guix-commits, 2023/06/20
- 17/89: gnu: hurd-minimal: Include libshouldbeinlibc and libstore., guix-commits, 2023/06/20
- 24/89: gnu: gnumach: Support "noide" argument., guix-commits, 2023/06/20
- 25/89: gnu: netdde: Resurrect and update to 2.6.32.65-2-e67c284ac1., guix-commits, 2023/06/20
- 26/89: hurd-boot: Cater for netdde., guix-commits, 2023/06/20
- 27/89: system: hurd: Add netdde to %base-packages/hurd., guix-commits, 2023/06/20
- 29/89: gnu: gnumach: Disable builtin networking., guix-commits, 2023/06/20
- 30/89: gnu: commencement: Add autoconf-boot0., guix-commits, 2023/06/20
- 53/89: gnu: libgpg-error: Skip failing test on the Hurd., guix-commits, 2023/06/20
- 64/89: gnu: openssl-1.1: Fix shared build for the Hurd.,
guix-commits <=
- 63/89: gnu: cairo: Support building for the Hurd., guix-commits, 2023/06/20
- 39/89: gnu: grep: Update hanging and failing tests on the Hurd., guix-commits, 2023/06/20
- 45/89: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/06/20
- 71/89: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/06/20
- 41/89: gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd., guix-commits, 2023/06/20
- 69/89: gnu: cmake-bootstrap: Fix build for the Hurd., guix-commits, 2023/06/20
- 35/89: gnu: commencement: hurd-minimal-boot0: Update to 0.9.git20230216., guix-commits, 2023/06/20
- 52/89: gnu: c-ares: Skip failing tests on the Hurd., guix-commits, 2023/06/20
- 38/89: gnu: coreutils: Skip hanging and failing test on the Hurd., guix-commits, 2023/06/20
- 58/89: gnu: emacs: Depend on libc-for-target., guix-commits, 2023/06/20