guix-commits
[Top][All Lists]
Advanced

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

01/04: gnu: p7zip: Fix building with gcc-10.


From: guix-commits
Subject: 01/04: gnu: p7zip: Fix building with gcc-10.
Date: Sun, 8 Aug 2021 04:32:21 -0400 (EDT)

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

commit fcd88262dfcbd2e85156f75e786a65b1ab3cc953
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Aug 8 10:44:00 2021 +0300

    gnu: p7zip: Fix building with gcc-10.
    
    * gnu/packages/compresson.scm (p7zip)[source]: Adjust snippet to fix
    compilation error using gcc-10.
---
 gnu/packages/compression.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 560e9d0..4e6370f 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1320,7 +1320,10 @@ for most inputs, but the resulting compressed files are 
anywhere from 20% to
                              (find-files  "Utils/file_Codecs_Rar_so.py")))
                   (delete-file-recursively "CPP/7zip/Archive/Rar")
                   (delete-file-recursively "CPP/7zip/Compress/Rar")
-                  #t))
+                  ;; Fix FTBFS with gcc-10.
+                  (substitute* "CPP/Windows/ErrorMsg.cpp"
+                    (("switch\\(errorCode\\) \\{")
+                     "switch(static_cast<HRESULT>(errorCode)) {"))))
               (patches (search-patches "p7zip-CVE-2016-9296.patch"
                                        "p7zip-CVE-2017-17969.patch"
                                        "p7zip-remove-unused-code.patch"))))



reply via email to

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