hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libzmq: fix issue with newer GCC and master branch (#31468)

Browse source 
Co-authored-by: Stephen Sachs <stesachs@amazon.com>
This commit is contained in:
Stephen Sachs 2022-07-07 16:45:37 +02:00 committed by GitHub
parent 386f08c1b4
commit e6bdbde54e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
var/spack/repos/builtin/packages/libzmq/package.py
View file

@ -49,9 +49,9 @@ class Libzmq(AutotoolsPackage):
depends_on("libsodium", when='+libsodium') depends_on("libsodium", when='+libsodium')
depends_on("libsodium@:1.0.3", when='+libsodium@:4.1.2') depends_on("libsodium@:1.0.3", when='+libsodium@:4.1.2')
depends_on('autoconf', type='build', when='@develop') depends_on('autoconf', type='build', when='@master')
depends_on('automake', type='build', when='@develop') depends_on('automake', type='build', when='@master')
depends_on('libtool', type='build', when='@develop') depends_on('libtool', type='build', when='@master')
depends_on('pkgconfig', type='build') depends_on('pkgconfig', type='build')
depends_on('docbook-xml', type='build', when='+docs') depends_on('docbook-xml', type='build', when='+docs')
depends_on('docbook-xsl', type='build', when='+docs') depends_on('docbook-xsl', type='build', when='+docs')
@ -61,6 +61,7 @@ class Libzmq(AutotoolsPackage):
depends_on('libunwind', when='+libunwind') depends_on('libunwind', when='+libunwind')
conflicts('%gcc@8:', when='@:4.2.2') conflicts('%gcc@8:', when='@:4.2.2')
conflicts('%gcc@12:', when='@4.3.2:4.3.4')
# Fix aggressive compiler warning false positive # Fix aggressive compiler warning false positive
patch('https://github.com/zeromq/libzmq/commit/92b2c38a2c51a1942a380c7ee08147f7b1ca6845.patch?full_index=1', sha256='310b8aa57a8ea77b7ac74debb3bf928cbafdef5e7ca35beaac5d9c61c7edd239', when='@4.2.3:4.3.4 %gcc@11:') patch('https://github.com/zeromq/libzmq/commit/92b2c38a2c51a1942a380c7ee08147f7b1ca6845.patch?full_index=1', sha256='310b8aa57a8ea77b7ac74debb3bf928cbafdef5e7ca35beaac5d9c61c7edd239', when='@4.2.3:4.3.4 %gcc@11:')
@ -72,7 +73,7 @@ def url_for_version(self, version):
url = "https://github.com/zeromq/libzmq/releases/download/v{0}/zeromq-{0}.tar.gz" url = "https://github.com/zeromq/libzmq/releases/download/v{0}/zeromq-{0}.tar.gz"
return url.format(version) return url.format(version)
@when('@develop') @when('@master')
def autoreconf(self, spec, prefix): def autoreconf(self, spec, prefix):
bash = which('bash') bash = which('bash')
bash('./autogen.sh') bash('./autogen.sh')