[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
64/92: gnu: openssl-1.1: Fix shared build for the Hurd.
From: |
guix-commits |
Subject: |
64/92: gnu: openssl-1.1: Fix shared build for the Hurd. |
Date: |
Fri, 23 Jun 2023 12:45:44 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 6fd78a7d752fc0631488be78e30a77f3879d69ef
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
- 67/92: gnu: swig: Skip tests when building for the Hurd., (continued)
- 67/92: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/06/23
- 72/92: gnu: graphite2: Skip test on the Hurd., guix-commits, 2023/06/23
- 74/92: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/06/23
- 24/92: gnu: gnumach: Support "noide" argument., guix-commits, 2023/06/23
- 45/92: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/06/23
- 48/92: gnu: python: Support native build on the Hurd., guix-commits, 2023/06/23
- 55/92: gnu: tcl: Remove failing tests on the Hurd.., guix-commits, 2023/06/23
- 58/92: gnu: emacs: Depend on libc-for-target., guix-commits, 2023/06/23
- 59/92: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/06/23
- 60/92: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/06/23
- 64/92: gnu: openssl-1.1: Fix shared build for the Hurd.,
guix-commits <=
- 69/92: gnu: cmake-bootstrap: Fix build for the Hurd., guix-commits, 2023/06/23
- 71/92: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/06/23
- 70/92: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/06/23
- 73/92: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/06/23
- 78/92: gnu: fontforge: Support build on the Hurd., guix-commits, 2023/06/23
- 79/92: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/06/23
- 80/92: gnu: guile-2.0: Skip failing tests on the Hurd., guix-commits, 2023/06/23
- 81/92: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/06/23
- 82/92: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/06/23
- 83/92: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/06/23