[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
36/66: gnu: openssl-1.1: Fix shared build for the Hurd.
From: |
guix-commits |
Subject: |
36/66: gnu: openssl-1.1: Fix shared build for the Hurd. |
Date: |
Fri, 14 Jul 2023 17:56:41 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit d7e16ce11d99d5d7b2a2d1ac0ae5e2726707d4f5
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
- 37/66: gnu: ruby-2.6: Skip test on the Hurd., (continued)
- 37/66: gnu: ruby-2.6: Skip test on the Hurd., guix-commits, 2023/07/14
- 38/66: gnu: tcsh: Skip substitution tests on the Hurd., guix-commits, 2023/07/14
- 39/66: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/07/14
- 04/66: gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20221224., guix-commits, 2023/07/14
- 09/66: gnu: guile: Skip hanging and failing pipe tests on the Hurd., guix-commits, 2023/07/14
- 21/66: gnu: mpfr: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 28/66: gnu: curl: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 31/66: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/07/14
- 32/66: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 35/66: gnu: cairo: Support building for the Hurd., guix-commits, 2023/07/14
- 36/66: gnu: openssl-1.1: Fix shared build for the Hurd.,
guix-commits <=
- 43/66: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/14
- 44/66: gnu: graphite2: Skip test on the Hurd., guix-commits, 2023/07/14
- 46/66: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/07/14
- 47/66: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/07/14
- 49/66: gnu: pango: Support build for the Hurd., guix-commits, 2023/07/14
- 48/66: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/07/14
- 50/66: gnu: fontforge: Support build on the Hurd., guix-commits, 2023/07/14
- 55/66: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/07/14
- 60/66: gnu: guix: Update to 1.4.0-8.51376bc6f6., guix-commits, 2023/07/14
- 63/66: DRAFT hurd-boot: Support second boot., guix-commits, 2023/07/14