me/guix
Archived
1
0
Fork 0
Code Activity

gnu: openssl-1.1: Fix shared build for the Hurd.

Browse source 
* gnu/packages/tls.scm (openssl-1.1)[arguments]: When building for the Hurd,
add phase 'patch-configure'.
(openssl)[arguments]: And delete it again.
This commit is contained in:
Janneke Nieuwenhuizen 2023-06-11 20:47:14 +02:00
parent 69142dbea4
commit fb6f94864d
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/tls.scm
View file

@ -470,6 +470,13 @@ OpenSSL for TARGET."
#$(target->openssl-target #$(target->openssl-target
(%current-target-system)))))) (%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 (replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys) (lambda* (#:key configure-flags #:allow-other-keys)
;; It's not a shebang so patch-source-shebangs misses it. ;; 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) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(setenv "HASHBANGPERL" (setenv "HASHBANGPERL"
(search-input-file (or native-inputs inputs) (search-input-file (or native-inputs inputs)
"/bin/perl")))))) "/bin/perl"))))
#$@(if (target-hurd?)
#~((delete 'patch-configure))
#~())))
((#:configure-flags flags #~'()) ((#:configure-flags flags #~'())
(if (system-hurd?) (if (system-hurd?)
#~(append #$flags '("hurd-x86")) ;must not be used when #~(append #$flags '("hurd-x86")) ;must not be used when