[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/65: gnu: openssl-1.1: Fix shared build for the Hurd.
From: |
guix-commits |
Subject: |
35/65: gnu: openssl-1.1: Fix shared build for the Hurd. |
Date: |
Fri, 14 Jul 2023 10:06:02 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 5f29c1cb48f189dd1b700db29a2011bc424010e3
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
- 08/65: gnu: guile: Skip hanging and failing pipe tests on the Hurd., (continued)
- 08/65: gnu: guile: Skip hanging and failing pipe tests on the Hurd., guix-commits, 2023/07/14
- 28/65: gnu: git: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 06/65: gnu: commencement: hurd-minimal-boot0: Update to 0.9.git20230216., guix-commits, 2023/07/14
- 14/65: gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd., guix-commits, 2023/07/14
- 20/65: gnu: mpfr: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 23/65: gnu: c-ares: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 24/65: gnu: libgpg-error: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 27/65: gnu: curl: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 25/65: gnu: libgcrypt: Skip hanging benchmark tests on the Hurd., guix-commits, 2023/07/14
- 34/65: gnu: cairo: Support building for the Hurd., guix-commits, 2023/07/14
- 35/65: gnu: openssl-1.1: Fix shared build for the Hurd.,
guix-commits <=
- 36/65: gnu: ruby-2.6: Skip test on the Hurd., guix-commits, 2023/07/14
- 39/65: gnu: zstd: Skip tests when building for the Hurd., guix-commits, 2023/07/14
- 42/65: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/14
- 51/65: gnu: guile-2.0: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 55/65: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/07/14
- 60/65: gnu: guix: Update to 1.4.0-9.5165f041af., guix-commits, 2023/07/14
- 64/65: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/07/14
- 21/65: gnu: elfutils: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 30/65: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/07/14
- 38/65: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/07/14