mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-22 10:16:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: p7zip: Fix building with gcc-10.

Browse source 
* gnu/packages/compresson.scm (p7zip)[source]: Adjust snippet to fix
compilation error using gcc-10.
This commit is contained in:
Efraim Flashner 2021-08-08 10:44:00 +03:00
parent 944ba4237f
commit fcd88262df
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/compression.scm
View file

@ -1320,7 +1320,10 @@ (define-public p7zip
(find-files "Utils/file_Codecs_Rar_so.py"))) (find-files "Utils/file_Codecs_Rar_so.py")))
(delete-file-recursively "CPP/7zip/Archive/Rar") (delete-file-recursively "CPP/7zip/Archive/Rar")
(delete-file-recursively "CPP/7zip/Compress/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" (patches (search-patches "p7zip-CVE-2016-9296.patch"
"p7zip-CVE-2017-17969.patch" "p7zip-CVE-2017-17969.patch"
"p7zip-remove-unused-code.patch")))) "p7zip-remove-unused-code.patch"))))