--- Begin Message ---
|
Subject: |
[PATCH] gnu: libdbi-drivers: Fix build with multi-output mariadb. |
|
Date: |
Sun, 8 Dec 2019 13:50:53 +0100 |
* gnu/packages/databases.scm (libdbi-drivers)[native-inputs]: Add mysql and
mysql-dev.
[inputs]: Remove mysql and add mysql-lib and zlib.
[arguments]: Remove unnecessary configure-flags and disable mysql
test because mysql_install_db fails to run.
---
gnu/packages/databases.scm | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index cb843672af..377efed42b 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3234,35 +3234,35 @@ simultaneous database connections by using this
framework.")
(build-system gnu-build-system)
(native-inputs
`(("inetutils" ,inetutils)
- ("glibc-locales" ,glibc-locales)))
+ ("glibc-locales" ,glibc-locales)
+ ("mysql" ,mariadb)
+ ("mysql-dev" ,mariadb "dev")))
(inputs
`(("libdbi" ,libdbi)
- ("mysql" ,mariadb)
+ ("mysql-lib" ,mariadb "lib")
("postgresql" ,postgresql)
- ("sqlite" ,sqlite)))
+ ("sqlite" ,sqlite)
+ ("zlib" ,zlib)))
(arguments
`(#:configure-flags
- (let ((libdbi (assoc-ref %build-inputs "libdbi"))
- (mysql (assoc-ref %build-inputs "mysql"))
- (postgresql (assoc-ref %build-inputs "postgresql"))
- (sqlite (assoc-ref %build-inputs "sqlite")))
+ (let ((libdbi (assoc-ref %build-inputs "libdbi")))
(list "--disable-docs"
(string-append "--with-dbi-incdir=" libdbi "/include")
(string-append "--with-dbi-libdir=" libdbi "/lib")
"--with-mysql"
- (string-append "--with-mysql-incdir=" mysql "/include/mysql")
- (string-append "--with-mysql-libdir=" mysql "/lib")
"--with-pgsql"
- (string-append "--with-pgsql-incdir=" postgresql "/include")
- (string-append "--with-pgsql-libdir=" postgresql "/lib")
- "--with-sqlite3"
- (string-append "--with-sqlite-incdir=" sqlite "/include")
- (string-append "--with-sqlite-libdir=" sqlite "/lib")))
+ "--with-sqlite3"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "tests/test_mysql.sh"
+ (("^mysql_install_db.*")
+ ;; FIXME: Disable the mysql test for now.
+ ;; The mysql_install_db program needs files in both the
+ ;; mariadb and mariadb:lib packages and fails to find
+ ;; the ones in mariadb:lib.
+ "exit 0\n")
(("^MYMYSQLD=.*")
(string-append "MYMYSQLD="
(assoc-ref inputs "mysql")
--
2.24.0
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#38527] [PATCH] gnu: libdbi-drivers: Fix build with multi-output mariadb. |
|
Date: |
Wed, 18 Dec 2019 22:49:17 +0100 |
|
User-agent: |
Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) |
Guillaume Le Vaillant <address@hidden> writes:
> * gnu/packages/databases.scm (libdbi-drivers)[native-inputs]: Add mysql and
> mysql-dev.
> [inputs]: Remove mysql and add mysql-lib and zlib.
> [arguments]: Remove unnecessary configure-flags and disable mysql
> test because mysql_install_db fails to run.
Whoops, I did not see this issue until I had fixed it and searched for a
recent bug report on help-guix@. So I ended up pushing a variant that
fixed the MariaDB problem in 9077cf68ec57c0303ef7746e203c3fe5ed041add.
By the way, could you create an account on Savannah so that we can grant
you commit access? If you are okay with that, please send a signed
reply to this message signed by the same GPG key that you uploaded to
Savannah for signing git commits.
Thanks,
Marius
signature.asc
Description: PGP signature
--- End Message ---