summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeague Sterling <teaguesterling@users.noreply.github.com>2024-06-13 16:42:23 -0700
committerGitHub <noreply@github.com>2024-06-13 16:42:23 -0700
commit52bdaa7bf570d54199086b526969cbb9ce864d9f (patch)
tree69d4c16e92f41dce8b0bd2afa937bc8f69672792
parent96b42238c5d8c451c2af68762d3c7e4af44a8806 (diff)
downloadspack-52bdaa7bf570d54199086b526969cbb9ce864d9f.tar.gz
spack-52bdaa7bf570d54199086b526969cbb9ce864d9f.tar.bz2
spack-52bdaa7bf570d54199086b526969cbb9ce864d9f.tar.xz
spack-52bdaa7bf570d54199086b526969cbb9ce864d9f.zip
perl-dbd-mysql: add v4.052, v5.005 (#44503)
* Fixed some issues with installation breaking due to mysql_client * Remove debugging details * Adding client_only to deps * Adding client_only to variant and deps * Undoingw client_only to variant and deps
-rw-r--r--var/spack/repos/builtin/packages/perl-dbd-mysql/package.py29
1 files changed, 26 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py
index 0cdf051ce0..63f1fb2f9c 100644
--- a/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py
+++ b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py
@@ -15,6 +15,17 @@ class PerlDbdMysql(PerlPackage):
license("GPL-1.0-or-later OR Artistic-1.0-Perl")
version(
+ "5.005",
+ sha256="1558c203b3911e273d3f83249535b312165be2ca8edba6b6c210645d769d0541",
+ url="https://cpan.metacpan.org/authors/id/D/DV/DVEEDEN/DBD-mysql-5.005.tar.gz",
+ )
+ version(
+ "4.052",
+ sha256="a83f57af7817787de0ef56fb15fdfaf4f1c952c8f32ff907153b66d2da78ff5b",
+ url="https://cpan.metacpan.org/authors/id/D/DV/DVEEDEN/DBD-mysql-4.052.tar.gz",
+ )
+
+ version(
"4.050",
sha256="4f48541ff15a0a7405f76adc10f81627c33996fbf56c95c26c094444c0928d78",
url="https://cpan.metacpan.org/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz",
@@ -22,6 +33,18 @@ class PerlDbdMysql(PerlPackage):
version("4.043", sha256="629f865e8317f52602b2f2efd2b688002903d2e4bbcba5427cb6188b043d6f99")
depends_on("perl-devel-checklib", type="build", when="@4.050:")
- depends_on("perl-test-deep", type=("build", "run"))
- depends_on("perl-dbi", type=("build", "run"))
- depends_on("mysql-client")
+
+ with default_args(type=("build", "link", "run")):
+ # Does it's own version check and mariadb doesn't conform to it's
+ # strict checking. This could probably be patched in the future.
+ depends_on("mysql@4:", when="@4")
+ depends_on("mysql@8", when="@5")
+
+ with default_args(type=("build", "run")):
+ depends_on("perl-test-deep")
+ depends_on("perl-dbi")
+
+ def configure_args(self):
+ # Work around mysql_config providing incorrect linker args
+ mysql = self.spec["mysql-client"].prefix
+ return [f"--cflags=-I{mysql.include}", f"--libs=-L{mysql.lib} -lmysqlclient"]