summaryrefslogtreecommitdiff
path: root/gnu/packages/compression.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2021-08-08 10:44:00 +0300
committerEfraim Flashner <efraim@flashner.co.il>2021-08-08 10:44:00 +0300
commitfcd88262dfcbd2e85156f75e786a65b1ab3cc953 (patch)
treeeb5904d29c30497fac4562a07905e87da6bdce4d /gnu/packages/compression.scm
parent944ba4237f4c0ccab1bc62a23a31f577ce1878e5 (diff)
downloadguix-patches-fcd88262dfcbd2e85156f75e786a65b1ab3cc953.tar
guix-patches-fcd88262dfcbd2e85156f75e786a65b1ab3cc953.tar.gz
gnu: p7zip: Fix building with gcc-10.
* gnu/packages/compresson.scm (p7zip)[source]: Adjust snippet to fix compilation error using gcc-10.
Diffstat (limited to 'gnu/packages/compression.scm')
-rw-r--r--gnu/packages/compression.scm5
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 560e9d076a..4e6370f8c6 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"))))