[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
64/84: gnu: openssl-1.1: Fix shared build for the Hurd.
From: |
guix-commits |
Subject: |
64/84: gnu: openssl-1.1: Fix shared build for the Hurd. |
Date: |
Wed, 14 Jun 2023 06:24:01 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit b1a208a2e280ee5b2d6979ac1c0f42e9c47b5bcf
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
- 20/84: hurd-boot: Setup pci-arbiter and rumpdisk translators., (continued)
- 20/84: hurd-boot: Setup pci-arbiter and rumpdisk translators., guix-commits, 2023/06/14
- 11/84: squash! gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/14
- 13/84: Revert "hurd-boot: Add urandom and default-pager translators.", guix-commits, 2023/06/14
- 18/84: gnu: parted: Support building for the Hurd., guix-commits, 2023/06/14
- 07/84: squash! gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/14
- 26/84: hurd-boot: Cater for netdde., guix-commits, 2023/06/14
- 31/84: gnu: commencement: Add automake-boot0., guix-commits, 2023/06/14
- 38/84: gnu: coreutils: Skip hanging and failing test for the Hurd., guix-commits, 2023/06/14
- 53/84: gnu: libgpg-error: Skip failing test for the Hurd., guix-commits, 2023/06/14
- 74/84: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/06/14
- 64/84: gnu: openssl-1.1: Fix shared build for the Hurd.,
guix-commits <=
- 67/84: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/06/14
- 75/84: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/06/14
- 69/84: gnu: cmake-bootstrap: Fix build for the Hurd., guix-commits, 2023/06/14
- 08/84: gnu: gnumach: Update to 1.8+git20221224., guix-commits, 2023/06/14
- 06/84: squash! gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/14
- 05/84: gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/14
- 10/84: gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/14
- 16/84: gnu: Add rumpkernel., guix-commits, 2023/06/14
- 01/84: hurd-boot: Add urandom and default-pager translators., guix-commits, 2023/06/14
- 24/84: gnu: gnumach: Support "noide" argument., guix-commits, 2023/06/14