diff mbox series

[meta-oe,PATCHv2] replace libdbd-mysql-perl with dbd-mariadb

Message ID 20240610093656.2610-1-f_l_k@t-online.de
State Accepted
Headers show
Series [meta-oe,PATCHv2] replace libdbd-mysql-perl with dbd-mariadb | expand

Commit Message

Markus Volk June 10, 2024, 9:36 a.m. UTC 
libdbd-mysql-perl is broken with mariadb/gcc14 and upstream does not support mariadb.
[https://github.com/perl5-dbi/DBD-mysql/issues/430]

Use the perl database driver that is provided by the mariadb project instead.
[https://mariadb.com/kb/en/perl-dbi]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-oe/recipes-dbs/mysql/mariadb.inc         |  2 +-
 .../recipes-devtools/perl/dbd-mariadb_1.23.bb | 20 ++++++++++++++++
 .../perl/libdbd-mysql-perl_5.006.bb           | 24 -------------------
 3 files changed, 21 insertions(+), 25 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb
 delete mode 100644 meta-oe/recipes-devtools/perl/libdbd-mysql-perl_5.006.bb
diff mbox series

Patch

diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 695965f7d..4bfa1c9ca 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -215,7 +215,7 @@  RDEPENDS:${PN}-client = "perl perl-module-getopt-long perl-module-file-temp \
 RDEPENDS:${PN}-server = "perl perl-module-getopt-long perl-module-data-dumper \
     perl-module-file-basename perl-module-file-path perl-module-sys-hostname \
     perl-module-file-copy perl-module-file-temp perl-module-posix \
-    ${PN}-client ${PN}-setupdb libdbi-perl libdbd-mysql-perl lzo"
+    ${PN}-client ${PN}-setupdb libdbi-perl dbd-mariadb lzo"
 RDEPENDS:${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-module-getopt-long \
     perl-module-posix perl-module-data-dumper perl-module-sigtrap perl-module-threads \
     perl-module-threads-shared perl-module-io-socket perl-module-sys-hostname perl-module-file-copy \
diff --git a/meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb
new file mode 100644
index 000000000..0eaf2137b
--- /dev/null
+++ b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb
@@ -0,0 +1,20 @@ 
+DESPCRIPTION = "DBD::MariaDB is the Perl5 Database Interface driver for MariaDB and MySQL databases."
+HOMEPAGE = "https://metacpan.org/dist/DBD-MariaDB"
+LICENSE = "GPL-1.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c"
+
+DEPENDS = "libdbi-perl-native libdev-checklib-perl-native libmysqlclient"
+
+SRC_URI = "${CPAN_MIRROR}/authors/id/P/PA/PALI/DBD-MariaDB-${PV}.tar.gz"
+SRC_URI[sha256sum] = "0d0c76c660ddd55570e48f3e2fdea8f621a69ac0ed48190e8cfcafcb5e9b859d"
+
+RDEPENDS:${PN} = "libdbi-perl"
+
+S = "${WORKDIR}/DBD-MariaDB-${PV}"
+
+inherit cpan
+
+RDEPENDS:${PN}-ptest += " \
+	libtest-warnings-perl \
+	perl-module-test-more \
+"
diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_5.006.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_5.006.bb
deleted file mode 100644
index 919997914..000000000
--- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_5.006.bb
+++ /dev/null
@@ -1,24 +0,0 @@ 
-SUMMARY = "A Perl DBI driver for MySQL"
-DESCRIPTION = "DBD::mysql is the Perl5 Database Interface driver for \
-the MySQL database. In other words: DBD::mysql is an interface between \
-the Perl programming language and the MySQL programming API that comes \
-with the MySQL relational database management system. Most functions \
-provided by this programming API are supported. Some rarely used \
-functions are missing, mainly because no-one ever requested them. \
-"
-HOMEPAGE = "https://github.com/perl5-dbi/DBD-mysql"
-
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
-DEPENDS += "libdev-checklib-perl-native libdbi-perl-native libmysqlclient"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c"
-
-SRCREV = "9b5b70ea372f49fe9bc9e592dae3870596d1e3d6"
-SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https;branch=master"
-
-S = "${WORKDIR}/git"
-
-inherit cpan
-
-EXTRA_OEMAKE = ' CC="${CC} -Wno-incompatible-pointer-types"'