[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/67: gnu: openssl-1.1: Fix shared build for the Hurd.
From: |
guix-commits |
Subject: |
35/67: gnu: openssl-1.1: Fix shared build for the Hurd. |
Date: |
Tue, 18 Jul 2023 10:57:04 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 0645e6a1b8e60469607b9b041de89203ab860a26
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
- 45/67: gnu: glib: Disable tests for the Hurd., (continued)
- 45/67: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/07/18
- 17/67: gnu: m4: Skip gnulib stack-overflow tests for the Hurd., guix-commits, 2023/07/18
- 01/67: gnu: commencement: Add autoconf-boot0., guix-commits, 2023/07/18
- 27/67: gnu: curl: Skip failing test on the Hurd., guix-commits, 2023/07/18
- 30/67: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/07/18
- 22/67: gnu: libbsd: Skip failing test on the Hurd., guix-commits, 2023/07/18
- 42/67: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/18
- 43/67: gnu: graphite2: Skip test on the Hurd., guix-commits, 2023/07/18
- 62/67: gnu: guix: Update to 1.4.0-9.b45f40d4fc., guix-commits, 2023/07/18
- 53/67: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/07/18
- 35/67: gnu: openssl-1.1: Fix shared build for the Hurd.,
guix-commits <=
- 49/67: gnu: fontforge: Support build on the Hurd., guix-commits, 2023/07/18
- 60/67: gnu: guix: Disable some tests on the Hurd., guix-commits, 2023/07/18
- 55/67: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/07/18
- 48/67: gnu: pango: Support build for the Hurd., guix-commits, 2023/07/18
- 66/67: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/07/18
- 26/67: gnu: tcl: Remove failing tests on the Hurd.., guix-commits, 2023/07/18
- 65/67: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/07/18
- 29/67: gnu: emacs: Depend on libc-for-target., guix-commits, 2023/07/18
- 47/67: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/07/18
- 04/67: gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20221224., guix-commits, 2023/07/18