zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch to fix mariadb and mariadb-c-client packages for cmake-3.20 (#22854)

Browse Source
This commit is contained in:
Glenn Johnson 2021-04-08 03:50:17 -05:00 committed by GitHub
parent f1f5f9bf5b
commit 8246e4dde0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/mariadb-c-client/package.py
View File

@ -57,6 +57,10 @@ class MariadbCClient(CMakePackage):
depends_on('openssl') depends_on('openssl')
depends_on('zlib') 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): def url_for_version(self, version):
url = "https://downloads.mariadb.com/Connectors/c/connector-c-{0}/mariadb-connector-c-{1}-src.tar.gz" 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) return url.format(version.up_to(3), version)

6
var/spack/repos/builtin/packages/mariadb/package.py
View File

@ -56,6 +56,12 @@ class Mariadb(CMakePackage):
conflicts('%gcc@9.1.0:', when='@:5.5') 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): def cmake_args(self):
args = [] args = []