diff options
| author | Glenn Johnson <glenn-johnson@uiowa.edu> | 2021-04-08 03:50:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-08 10:50:17 +0200 |
| commit | 8246e4dde0b359e11a06e8ec7ce406ceaee0dad4 (patch) | |
| tree | 34270689222b6206024de06ffdc0d3f5cc000780 /var | |
| parent | f1f5f9bf5b1b5bd9c9f0669c190b06880cd2baab (diff) | |
| download | spack-8246e4dde0b359e11a06e8ec7ce406ceaee0dad4.tar.gz spack-8246e4dde0b359e11a06e8ec7ce406ceaee0dad4.tar.bz2 spack-8246e4dde0b359e11a06e8ec7ce406ceaee0dad4.tar.xz spack-8246e4dde0b359e11a06e8ec7ce406ceaee0dad4.zip | |
Patch to fix mariadb and mariadb-c-client packages for cmake-3.20 (#22854)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/mariadb-c-client/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/mariadb/package.py | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/mariadb-c-client/package.py b/var/spack/repos/builtin/packages/mariadb-c-client/package.py index 8d729971d9..d7b465f441 100644 --- a/var/spack/repos/builtin/packages/mariadb-c-client/package.py +++ b/var/spack/repos/builtin/packages/mariadb-c-client/package.py @@ -57,6 +57,10 @@ class MariadbCClient(CMakePackage): depends_on('openssl') depends_on('zlib') + # patch needed for cmake-3.20 + patch('https://github.com/mariadb-corporation/mariadb-connector-c/commit/242cab8c.patch', + sha256='bcfa0a73a34654495f5dea3cecdcb7de911c7c2446240aeaa674a4b2ab46f58c') + def url_for_version(self, version): url = "https://downloads.mariadb.com/Connectors/c/connector-c-{0}/mariadb-connector-c-{1}-src.tar.gz" return url.format(version.up_to(3), version) diff --git a/var/spack/repos/builtin/packages/mariadb/package.py b/var/spack/repos/builtin/packages/mariadb/package.py index c7af91f2b5..8ffac00eb1 100644 --- a/var/spack/repos/builtin/packages/mariadb/package.py +++ b/var/spack/repos/builtin/packages/mariadb/package.py @@ -56,6 +56,12 @@ class Mariadb(CMakePackage): conflicts('%gcc@9.1.0:', when='@:5.5') + # patch needed for cmake-3.20 + patch('https://github.com/mariadb-corporation/mariadb-connector-c/commit/242cab8c.patch', + sha256='bcfa0a73a34654495f5dea3cecdcb7de911c7c2446240aeaa674a4b2ab46f58c', + working_dir='libmariadb', + when='@10.2.8:') + def cmake_args(self): args = [] |