zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

p7zip: resolve gcc 10 conflict (#25676)

Browse Source 
Fix credit: Eric Brugger
This commit is contained in:
Olivier Cessenat 2021-09-20 13:43:07 +02:00 committed by GitHub
parent c6f9e9baf6
commit 1ea58e0cb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/p7zip/gcc10.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/CPP/Windows/ErrorMsg.cpp.orig b/CPP/Windows/ErrorMsg.cpp
index 99684ae..68416d6 100644
--- a/CPP/Windows/ErrorMsg.cpp.orig
+++ b/CPP/Windows/ErrorMsg.cpp
@@ -13,7 +13,7 @@ UString MyFormatMessage(DWORD errorCode)
const char * txt = 0;
AString msg;
- switch(errorCode) {
+ switch((Int32)errorCode) {
case ERROR_NO_MORE_FILES : txt = "No more files"; break ;
case E_NOTIMPL : txt = "E_NOTIMPL"; break ;
case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ;

2
var/spack/repos/builtin/packages/p7zip/package.py
View File

@ -13,7 +13,7 @@ class P7zip(MakefilePackage):
version('16.02', sha256='5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f') version('16.02', sha256='5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f')
conflicts('%gcc@10:') patch('gcc10.patch', when='%gcc@10:', sha256='96914025b9f431fdd75ae69768162d57751413634622f9df1a4bc4960e7e8fe1')
# all3 includes 7z, 7za, and 7zr # all3 includes 7z, 7za, and 7zr
build_targets = ['all3'] build_targets = ['all3']