From 6e8caab7729e3e0fc207d7f713237895e855a638 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Fri, 30 Aug 2019 22:52:06 +0200
Subject: [PATCH] gnu: mariadb: Split into out, lib and dev.
* gnu/packages/databases.scm (mariadb): Split into out, lib and dev.
(perl-dbd-mysql, python-mysqlclient): Adjust dependencies.
* gnu/packages/bioinformatics.scm (kentutils): Adjust dependencies.
* gnu/packages/cran.scm (r-rmysql): Adjust dependencies.
* gnu/packages/emacs-xyz.scm (emacs-emacsql): Adjust dependencies.
* gnu/packages/kodi.scm (kodi): Adjust dependencies.
* gnu/packages/qt.scm (qt, qtbase): Adjust dependencies.
* gnu/packages/ruby.scm (ruby-mysql2): Adjust dependencies.
---
gnu/packages/bioinformatics.scm | 3 +-
gnu/packages/cran.scm | 3 +-
gnu/packages/databases.scm | 57 ++++++++++++++++++++++++---------
gnu/packages/emacs-xyz.scm | 3 +-
gnu/packages/kodi.scm | 3 +-
gnu/packages/qt.scm | 6 ++--
gnu/packages/ruby.scm | 3 +-
7 files changed, 55 insertions(+), 23 deletions(-)
@@ -11269,7 +11269,8 @@ models. TADbit is complemented by TADkit for visualizing 3D models.")
("tcsh" ,tcsh)
("perl" ,perl)
("libpng" ,libpng)
- ("mariadb" ,mariadb)
+ ("mariadb" ,mariadb "lib")
+ ("mariadb-dev" ,mariadb "dev")
("openssl" ,openssl)))
(home-page "http://genome.cse.ucsc.edu/index.html")
(synopsis "Assorted bioinformatics utilities")
@@ -2601,7 +2601,8 @@ dimensioned arrays.")
(properties `((upstream-name . "RMySQL")))
(build-system r-build-system)
(inputs
- `(("mariadb" ,mariadb)
+ `(("mariadb" ,mariadb "lib")
+ ("mariadb-dev" ,mariadb "dev")
("zlib" ,zlib)))
(propagated-inputs
`(("r-dbi" ,r-dbi)))
@@ -642,9 +642,11 @@ Language.")
(find-files "pcre") (find-files "zlib")))
#t))))
(build-system cmake-build-system)
+ (outputs '("out" "lib" "dev"))
(arguments
`(#:configure-flags
- '("-DBUILD_CONFIG=mysql_release"
+ (list
+ "-DBUILD_CONFIG=mysql_release"
;; Linking with libarchive fails, like this:
;; ld: /gnu/store/...-libarchive-3.2.2/lib/libarchive.a(archive_entry.o):
@@ -668,15 +670,26 @@ Language.")
"-DDEFAULT_COLLATION=utf8_general_ci"
"-DMYSQL_DATADIR=/var/lib/mysql"
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
- "-DINSTALL_INFODIR=share/mysql/docs"
- "-DINSTALL_MANDIR=share/man"
+ (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "lib"))
+ (string-append "-DCMAKE_INSTALL_RPATH=" (assoc-ref %outputs "lib")
+ "/lib")
+ (string-append "-DINSTALL_INFODIR=" (assoc-ref %outputs "out")
+ "/share/mysql/docs")
+ (string-append "-DINSTALL_MANDIR=" (assoc-ref %outputs "out")
+ "/share/man")
+ (string-append "-DINSTALL_SCRIPTDIR=" (assoc-ref %outputs "out") "/bin")
+ (string-append "-DINSTALL_BINDIR=" (assoc-ref %outputs "out") "/bin")
+ "-DCMAKE_INSTALL_LIBDIR=lib"
"-DINSTALL_PLUGINDIR=lib/mysql/plugin"
- "-DINSTALL_SCRIPTDIR=bin"
- "-DINSTALL_INCLUDEDIR=include/mysql"
- "-DINSTALL_DOCREADMEDIR=share/mysql/docs"
- "-DINSTALL_SUPPORTFILESDIR=share/mysql/support-files"
+ (string-append "-DINSTALL_INCLUDEDIR=" (assoc-ref %outputs "dev")
+ "/include/mysql")
+ (string-append "-DINSTALL_DOCREADMEDIR=" (assoc-ref %outputs "out")
+ "/share/mysql/docs")
+ (string-append "-DINSTALL_DOCDIR=" (assoc-ref %outputs "out")
+ "/share/mysql/docs")
+ (string-append "-DINSTALL_SUPPORTFILESDIR=" (assoc-ref %outputs "out")
+ "/share/mysql/support-files")
"-DINSTALL_MYSQLSHAREDIR=share/mysql"
- "-DINSTALL_DOCDIR=share/mysql/docs"
"-DINSTALL_SHAREDIR=share")
#:phases
(modify-phases %standard-phases
@@ -759,19 +772,29 @@ Language.")
'install 'post-install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (test (assoc-ref outputs "test")))
+ (dev (assoc-ref outputs "dev"))
+ (lib (assoc-ref outputs "lib")))
(substitute* (string-append out "/bin/mysql_install_db")
(("basedir=\"\"")
(string-append "basedir=\"" out "\"")))
;; Remove unneeded files for testing.
- (with-directory-excursion out
+ (with-directory-excursion lib
(for-each delete-file-recursively
- '("data" "mysql-test" "sql-bench"
- "share/man/man1/mysql-test-run.pl.1"))
- ;; Delete huge and unnecessary executables.
- (for-each delete-file (find-files "bin" "(test|embedded)"))
+ '("data" "mysql-test" "sql-bench"))
;; And 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.
+ (for-each delete-file (find-files "bin" "(test|embedded)")))
+ (mkdir-p (string-append dev "/share"))
+ (mkdir-p (string-append dev "/bin"))
+ (rename-file (string-append lib "/bin/mysqld")
+ (string-append out "/bin/mysqld"))
+ (rename-file (string-append lib "/share/pkgconfig")
+ (string-append dev "/share/pkgconfig"))
+ (rename-file (string-append out "/bin/mysql_config")
+ (string-append dev "/bin/mysql_config"))
#t))))))
(native-inputs
`(("bison" ,bison)
@@ -1535,7 +1558,8 @@ columns, primary keys, unique constraints and relationships.")
#:tests? #f))
(propagated-inputs
`(("perl-dbi" ,perl-dbi)
- ("mysql" ,mariadb)))
+ ("mysql" ,mariadb "lib")
+ ("mysql-dev" ,mariadb "dev")))
(home-page "https://metacpan.org/release/DBD-mysql")
(synopsis "DBI MySQL interface")
(description "This package provides a MySQL driver for the Perl5
@@ -2653,7 +2677,8 @@ database).")
("mock" ,python-mock)
("py.test" ,python-pytest)))
(inputs
- `(("mysql" ,mariadb)
+ `(("mysql" ,mariadb "lib")
+ ("mysql-dev" ,mariadb "dev")
("libz" ,zlib)
("openssl" ,openssl)))
(home-page "https://github.com/PyMySQL/mysqlclient-python")
@@ -10787,7 +10787,8 @@ object has been freed.")
#t)))))
(inputs
`(("emacs-minimal" ,emacs-minimal)
- ("mariadb" ,mariadb)
+ ("mariadb" ,mariadb "lib")
+ ("mariadb-dev" ,mariadb "dev")
("postgresql" ,postgresql)))
(propagated-inputs
`(("emacs-finalize" ,emacs-finalize)
@@ -436,7 +436,8 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
("libxrender" ,libxrender)
("libxslt" ,libxslt)
("lzo" ,lzo)
- ("mariadb" ,mariadb)
+ ("mariadb" ,mariadb "lib")
+ ("mariadb-dev" ,mariadb "dev")
("openssl" ,openssl)
("pcre" ,pcre)
("pulseaudio" ,pulseaudio)
@@ -218,7 +218,8 @@ system, and the core design of Django is reused in Grantlee.")
("libxslt" ,libxslt)
("libxtst" ,libxtst)
("mtdev" ,mtdev)
- ("mariadb" ,mariadb)
+ ("mariadb" ,mariadb "lib")
+ ("mariadb-dev" ,mariadb "dev")
("nss" ,nss)
("openssl" ,openssl)
("postgresql" ,postgresql)
@@ -569,7 +570,8 @@ system, and the core design of Django is reused in Grantlee.")
("libxslt" ,libxslt)
("libxtst" ,libxtst)
("mtdev" ,mtdev)
- ("mariadb" ,mariadb)
+ ("mariadb" ,mariadb "lib")
+ ("mariadb-dev" ,mariadb "dev")
("nss" ,nss)
("openssl" ,openssl)
("pcre2" ,pcre2)
@@ -2615,7 +2615,8 @@ specs for Ruby implementations in ruby/spec.")
(invoke "rspec"))
#t)))))
(inputs
- `(("mariadb" ,mariadb)
+ `(("mariadb" ,mariadb "lib")
+ ("mariadb-dev" ,mariadb "dev")
("zlib" ,zlib)))
(native-inputs
`(("ruby-rspec" ,ruby-rspec)
--
2.22.0