diff options
| author | Olivier Cessenat <cessenat@gmail.com> | 2021-09-20 13:43:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 07:43:07 -0400 |
| commit | 1ea58e0cb9aadfefc8e5e9f013622478b40c2952 (patch) | |
| tree | e273aa29e4edcb3b2b03dd4ab871327baf55ed67 /var | |
| parent | c6f9e9baf68da5fefc6f43db7b071a15d0a1a5a9 (diff) | |
| download | spack-1ea58e0cb9aadfefc8e5e9f013622478b40c2952.tar.gz spack-1ea58e0cb9aadfefc8e5e9f013622478b40c2952.tar.bz2 spack-1ea58e0cb9aadfefc8e5e9f013622478b40c2952.tar.xz spack-1ea58e0cb9aadfefc8e5e9f013622478b40c2952.zip | |
p7zip: resolve gcc 10 conflict (#25676)
Fix credit: Eric Brugger
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/p7zip/gcc10.patch | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/p7zip/package.py | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/p7zip/gcc10.patch b/var/spack/repos/builtin/packages/p7zip/gcc10.patch new file mode 100644 index 0000000000..809b25a895 --- /dev/null +++ b/var/spack/repos/builtin/packages/p7zip/gcc10.patch @@ -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 ; diff --git a/var/spack/repos/builtin/packages/p7zip/package.py b/var/spack/repos/builtin/packages/p7zip/package.py index 3de8333350..ebadd36c98 100644 --- a/var/spack/repos/builtin/packages/p7zip/package.py +++ b/var/spack/repos/builtin/packages/p7zip/package.py @@ -13,7 +13,7 @@ class P7zip(MakefilePackage): version('16.02', sha256='5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f') - conflicts('%gcc@10:') + patch('gcc10.patch', when='%gcc@10:', sha256='96914025b9f431fdd75ae69768162d57751413634622f9df1a4bc4960e7e8fe1') # all3 includes 7z, 7za, and 7zr build_targets = ['all3'] |