[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
64/85: gnu: openssl-1.1: Fix shared build for the Hurd.
From: |
guix-commits |
Subject: |
64/85: gnu: openssl-1.1: Fix shared build for the Hurd. |
Date: |
Thu, 15 Jun 2023 02:32:43 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit ac54278cd3987a821131b9246478ba2f46661fe7
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 b891329811..7da652573b 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -471,6 +471,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.
@@ -586,7 +593,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
- 40/85: Revert "gnu: sed: Skip failing test on GNU/Hurd.", (continued)
- 40/85: Revert "gnu: sed: Skip failing test on GNU/Hurd.", guix-commits, 2023/06/15
- 34/85: gnu: commencement: hurd-headers-boot0: Update to 0.9.git20230216., guix-commits, 2023/06/15
- 74/85: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/06/15
- 55/85: gnu: tcl: Remove failing tests for the Hurd.., guix-commits, 2023/06/15
- 79/85: gnu: po4a: Skip failing test for the Hurd., guix-commits, 2023/06/15
- 35/85: gnu: commencement: hurd-minimal-boot0: Update to 0.9.git20230216., guix-commits, 2023/06/15
- 47/85: gnu: openssl: Build fix for the Hurd., guix-commits, 2023/06/15
- 43/85: gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd., guix-commits, 2023/06/15
- 46/85: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/06/15
- 69/85: gnu: cmake-bootstrap: Fix build for the Hurd., guix-commits, 2023/06/15
- 64/85: gnu: openssl-1.1: Fix shared build for the Hurd.,
guix-commits <=
- 68/85: gnu: zstd: Skip tests when building for the Hurd., guix-commits, 2023/06/15
- 71/85: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/06/15
- 59/85: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/06/15
- 83/85: DRAFT hurd: Support second boot., guix-commits, 2023/06/15
- 42/85: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS for the Hurd., guix-commits, 2023/06/15
- 65/85: gnu: ruby-2.6: Skip test for the Hurd., guix-commits, 2023/06/15
- 61/85: gnu: parted: Disable tests for the Hurd., guix-commits, 2023/06/15
- 16/85: gnu: Add rumpkernel., guix-commits, 2023/06/15
- 31/85: gnu: commencement: Add automake-boot0., guix-commits, 2023/06/15
- 62/85: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/06/15