guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: openssl: Delete ELF files from tarball.


From: Ludovic Courtès
Subject: 01/01: gnu: openssl: Delete ELF files from tarball.
Date: Tue, 30 May 2017 04:09:35 -0400 (EDT)

civodul pushed a commit to branch core-updates
in repository guix.

commit 8a9b08b503c209c020f7e7dab16b8818208003f6
Author: Sergei Trofimovich <address@hidden>
Date:   Sun May 28 09:39:05 2017 +0100

    gnu: openssl: Delete ELF files from tarball.
    
    Otherwise building openssl fails: substitute can't decode binary ELF file:
    
      ice-9/boot-9.scm:760:25: In procedure dispatch-exception:
      ice-9/boot-9.scm:760:25: Throw to key `decoding-error' with args
      `("peek-char" "input decoding error" 84 #<input: test/ssltest_old 15>)'.
    
    * gnu/packages/tls.scm (openssl)[source]: Add 'snippet'.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 gnu/packages/tls.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 6a0b063..349e951 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -235,6 +235,13 @@ required structures.")
              (sha256
               (base32
                "037kvpisc6qh5dkppcwbm5bg2q800xh2hma3vghz8xcycmdij1yf"))
+             (snippet
+              '(begin
+                 ;; Remove ELF files.  'substitute*' can't read them.
+                 (delete-file "test/ssltest_old")
+                 (delete-file "test/v3ext")
+                 (delete-file "test/x509aux")
+                 #t))
              (patches (search-patches "openssl-runpath.patch"
                                       "openssl-c-rehash-in.patch"))))
    (build-system gnu-build-system)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]