summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorStephen Sachs <stephenmsachs@gmail.com>2022-07-07 16:45:37 +0200
committerGitHub <noreply@github.com>2022-07-07 08:45:37 -0600
commite6bdbde54e61681ee31a49c59bb56f7f3c8245f5 (patch)
tree24e33375c0819fcf700185724bfe1dfde047fa7b /var
parent386f08c1b49cab85513af339d9a97151d79061be (diff)
downloadspack-e6bdbde54e61681ee31a49c59bb56f7f3c8245f5.tar.gz
spack-e6bdbde54e61681ee31a49c59bb56f7f3c8245f5.tar.bz2
spack-e6bdbde54e61681ee31a49c59bb56f7f3c8245f5.tar.xz
spack-e6bdbde54e61681ee31a49c59bb56f7f3c8245f5.zip
libzmq: fix issue with newer GCC and master branch (#31468)
Co-authored-by: Stephen Sachs <stesachs@amazon.com>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/libzmq/package.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/libzmq/package.py b/var/spack/repos/builtin/packages/libzmq/package.py
index 1dd84b4324..3a2dc2f73a 100644
--- a/var/spack/repos/builtin/packages/libzmq/package.py
+++ b/var/spack/repos/builtin/packages/libzmq/package.py
@@ -49,9 +49,9 @@ class Libzmq(AutotoolsPackage):
depends_on("libsodium", when='+libsodium')
depends_on("libsodium@:1.0.3", when='+libsodium@:4.1.2')
- depends_on('autoconf', type='build', when='@develop')
- depends_on('automake', type='build', when='@develop')
- depends_on('libtool', type='build', when='@develop')
+ depends_on('autoconf', type='build', when='@master')
+ depends_on('automake', type='build', when='@master')
+ depends_on('libtool', type='build', when='@master')
depends_on('pkgconfig', type='build')
depends_on('docbook-xml', type='build', when='+docs')
depends_on('docbook-xsl', type='build', when='+docs')
@@ -61,6 +61,7 @@ class Libzmq(AutotoolsPackage):
depends_on('libunwind', when='+libunwind')
conflicts('%gcc@8:', when='@:4.2.2')
+ conflicts('%gcc@12:', when='@4.3.2:4.3.4')
# 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:')
@@ -72,7 +73,7 @@ class Libzmq(AutotoolsPackage):
url = "https://github.com/zeromq/libzmq/releases/download/v{0}/zeromq-{0}.tar.gz"
return url.format(version)
- @when('@develop')
+ @when('@master')
def autoreconf(self, spec, prefix):
bash = which('bash')
bash('./autogen.sh')