[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/40: gnu: MariaDB: Update to 10.5.8.
From: |
guix-commits |
Subject: |
04/40: gnu: MariaDB: Update to 10.5.8. |
Date: |
Sun, 13 Dec 2020 15:46:13 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit ce29031a23104928155b498d552fc4140cc03030
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Nov 29 20:09:32 2020 +0100
gnu: MariaDB: Update to 10.5.8.
* gnu/packages/databases.scm (mariadb): Update to 10.5.8.
[arguments]: Adjust #:configure-flags to not install tests; remove code for
the same. Adjust phases for upstream test changes. Add workaround.
---
gnu/packages/databases.scm | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 4b1a1ff..bf9f31a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -898,7 +898,7 @@ Language.")
(define-public mariadb
(package
(name "mariadb")
- (version "10.5.6")
+ (version "10.5.8")
(source (origin
(method url-fetch)
(uri (string-append "https://downloads.mariadb.com/MariaDB"
@@ -906,7 +906,7 @@ Language.")
version ".tar.gz"))
(sha256
(base32
- "1i257h0zdypdfj5wkg6ck9pxlkph0jvjs92k22pjr6gnx5lxs1gz"))
+ "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -956,6 +956,11 @@ Language.")
"-DDEFAULT_COLLATION=utf8_general_ci"
"-DMYSQL_DATADIR=/var/lib/mysql"
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+
+ ;; Do not install the tests or benchmark suite.
+ "-DINSTALL_MYSQLTESTDIR=false"
+ "-DINSTALL_SQLBENCHDIR=false"
+
(string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "lib"))
(string-append "-DCMAKE_INSTALL_RPATH=" (assoc-ref %outputs "lib")
"/lib")
@@ -1005,8 +1010,15 @@ Language.")
"main.explain_non_select"
"main.stat_tables"
"main.stat_tables_innodb"
+ "main.upgrade_MDEV-19650"
"roles.acl_statistics"
+ ;; FIXME: This test checks various table encodings and
+ ;; fails because Guix defaults to UTF8 instead of the
+ ;; upstream default latin1_swedish_ci. It's not easily
+ ;; substitutable because several encodings are tested.
+ "main.sp2"
+
;; This file contains a time bomb which makes it fail
after
;; 2030-12-31. See <https://bugs.gnu.org/34351> for
details.
"main.mysqldump"))
@@ -1077,12 +1089,15 @@ Language.")
(("\\$basedir/share/mysql")
(string-append lib "/share/mysql")))
- ;; Remove unneeded files for testing.
(with-directory-excursion lib
- (for-each delete-file-recursively
- '("mysql-test" "sql-bench"))
- ;; And static libraries.
+ ;; FIXME: Something creates an empty gnu/store/xxx-mariadb/bin
+ ;; directory at the root of the lib output. It's not present
+ ;; in the installation log. This started occuring between
+ ;; 10.5.6 and 10.5.8. How to prevent it?
+ (delete-file-recursively "gnu")
+ ;; Remove static libraries.
(for-each delete-file (find-files "lib" "\\.a$")))
+
(with-directory-excursion out
(delete-file "share/man/man1/mysql-test-run.pl.1")
;; Delete huge and unnecessary executables.
- branch staging updated (bdfdb9d -> a73302e), guix-commits, 2020/12/13
- 01/40: Merge branch 'ungrafting' into staging, guix-commits, 2020/12/13
- 02/40: gnu: linux-pam: Update to 1.5.1., guix-commits, 2020/12/13
- 03/40: gnu: nss, nss-certs: Update to 3.59., guix-commits, 2020/12/13
- 06/40: gnu: Remove gdb@9., guix-commits, 2020/12/13
- 04/40: gnu: MariaDB: Update to 10.5.8.,
guix-commits <=
- 05/40: gnu: Qt: Update to 5.15.2., guix-commits, 2020/12/13
- 09/40: gnu: ImageMagick: Update to 6.9.11-48., guix-commits, 2020/12/13
- 13/40: gnu: python-cryptography: Update to 3.3.1., guix-commits, 2020/12/13
- 12/40: gnu: python-iso8601: Update to 0.1.13., guix-commits, 2020/12/13
- 08/40: gnu: libva: Update to 2.10.0., guix-commits, 2020/12/13
- 16/40: gnu: python-babel: Update to 2.9.0., guix-commits, 2020/12/13
- 19/40: gnu: python-urllib3: Update to 1.26.2., guix-commits, 2020/12/13
- 20/40: gnu: python-sphinx: Update to 3.3.1., guix-commits, 2020/12/13
- 14/40: gnu: python-pyopenssl: Update to 20.0.0., guix-commits, 2020/12/13
- 25/40: gnu: xorg-server-for-tests: Update to 1.20.10., guix-commits, 2020/12/13