diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2021-09-15 07:44:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 22:44:16 -0700 |
| commit | c52426ea7a17a60dd1f4e6d8aeaa4ead157badc7 (patch) | |
| tree | 31a0b0feefa1956782be89900838183f299b5491 /var | |
| parent | 0d0d438c119a770ba1d9db3126df1993b70448ca (diff) | |
| download | spack-c52426ea7a17a60dd1f4e6d8aeaa4ead157badc7.tar.gz spack-c52426ea7a17a60dd1f4e6d8aeaa4ead157badc7.tar.bz2 spack-c52426ea7a17a60dd1f4e6d8aeaa4ead157badc7.tar.xz spack-c52426ea7a17a60dd1f4e6d8aeaa4ead157badc7.zip | |
Make clingo the default solver (#25502)
Modifications:
- [x] Change `defaults/config.yaml`
- [x] Add a fix for bootstrapping patchelf from sources if `compilers.yaml` is empty
- [x] Make `SPACK_TEST_SOLVER=clingo` the default for unit-tests
- [x] Fix package failures in the e4s pipeline
Caveats:
1. CentOS 6 still uses the original concretizer as it can't connect to the buildcache due to issues with `ssl` (bootstrapping from sources requires a C++14 capable compiler)
1. I had to update the image tag for GitlabCI in e699f14.
1. libtool v2.4.2 has been deprecated and other packages received some update
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/libtool/package.py | 27 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/numactl/package.py | 4 |
2 files changed, 21 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index 2c2906f597..a85d09e633 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -15,18 +15,25 @@ class Libtool(AutotoolsPackage, GNUMirrorPackage): version('develop', git='https://git.savannah.gnu.org/git/libtool.git', branch='master', submodules=True) version('2.4.6', sha256='e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3') - version('2.4.2', sha256='b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918') + # Version released in 2011 + version('2.4.2', sha256='b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918', deprecated=True) depends_on('m4@1.4.6:', type='build') - depends_on('autoconf', type='build', when='@2.4.2,develop') - depends_on('automake', type='build', when='@2.4.2,develop') - depends_on('help2man', type='build', when='@2.4.2,develop') - depends_on('xz', type='build', when='@develop') - depends_on('texinfo', type='build', when='@develop') - - # Fix parsing of compiler output when collecting predeps and postdeps - # https://lists.gnu.org/archive/html/bug-libtool/2016-03/msg00003.html - patch('flag_space.patch', when='@develop') + + with when('@2.4.2'): + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('help2man', type='build') + + with when('@develop'): + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('help2man', type='build') + depends_on('xz', type='build') + depends_on('texinfo', type='build') + # Fix parsing of compiler output when collecting predeps and postdeps + # https://lists.gnu.org/archive/html/bug-libtool/2016-03/msg00003.html + patch('flag_space.patch') build_directory = 'spack-build' diff --git a/var/spack/repos/builtin/packages/numactl/package.py b/var/spack/repos/builtin/packages/numactl/package.py index 6aae477c83..52abf2353a 100644 --- a/var/spack/repos/builtin/packages/numactl/package.py +++ b/var/spack/repos/builtin/packages/numactl/package.py @@ -28,6 +28,10 @@ class Numactl(AutotoolsPackage): depends_on('libtool', type='build') depends_on('m4', type='build') + # Numactl has hardcoded minimum versions for libtool, + # libtool@develop returns UNKOWN as a version tag and fails + conflicts('libtool@develop') + def autoreconf(self, spec, prefix): bash = which('bash') bash('./autogen.sh') |