me
/
guix
Archived
1
0
Fork 0

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.
master
Julien Lepiller 2019-08-30 22:52:06 +02:00
parent 52b61e9991
commit 2b8491fbbe
No known key found for this signature in database
GPG Key ID: 43111F4520086A0C
7 changed files with 55 additions and 23 deletions

View File

@ -11272,7 +11272,8 @@ models. TADbit is complemented by TADkit for visualizing 3D models.")
("tcsh" ,tcsh) ("tcsh" ,tcsh)
("perl" ,perl) ("perl" ,perl)
("libpng" ,libpng) ("libpng" ,libpng)
("mariadb" ,mariadb) ("mariadb" ,mariadb "lib")
("mariadb-dev" ,mariadb "dev")
("openssl" ,openssl))) ("openssl" ,openssl)))
(home-page "http://genome.cse.ucsc.edu/index.html") (home-page "http://genome.cse.ucsc.edu/index.html")
(synopsis "Assorted bioinformatics utilities") (synopsis "Assorted bioinformatics utilities")

View File

@ -2689,7 +2689,8 @@ dimensioned arrays.")
(properties `((upstream-name . "RMySQL"))) (properties `((upstream-name . "RMySQL")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
`(("mariadb" ,mariadb) `(("mariadb" ,mariadb "lib")
("mariadb-dev" ,mariadb "dev")
("zlib" ,zlib))) ("zlib" ,zlib)))
(propagated-inputs (propagated-inputs
`(("r-dbi" ,r-dbi))) `(("r-dbi" ,r-dbi)))

View File

@ -647,9 +647,11 @@ Language.")
(find-files "pcre") (find-files "zlib"))) (find-files "pcre") (find-files "zlib")))
#t)))) #t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(outputs '("out" "lib" "dev"))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'("-DBUILD_CONFIG=mysql_release" (list
"-DBUILD_CONFIG=mysql_release"
;; Linking with libarchive fails, like this: ;; Linking with libarchive fails, like this:
;; ld: /gnu/store/...-libarchive-3.2.2/lib/libarchive.a(archive_entry.o): ;; ld: /gnu/store/...-libarchive-3.2.2/lib/libarchive.a(archive_entry.o):
@ -673,15 +675,26 @@ Language.")
"-DDEFAULT_COLLATION=utf8_general_ci" "-DDEFAULT_COLLATION=utf8_general_ci"
"-DMYSQL_DATADIR=/var/lib/mysql" "-DMYSQL_DATADIR=/var/lib/mysql"
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
"-DINSTALL_INFODIR=share/mysql/docs" (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "lib"))
"-DINSTALL_MANDIR=share/man" (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_PLUGINDIR=lib/mysql/plugin"
"-DINSTALL_SCRIPTDIR=bin" (string-append "-DINSTALL_INCLUDEDIR=" (assoc-ref %outputs "dev")
"-DINSTALL_INCLUDEDIR=include/mysql" "/include/mysql")
"-DINSTALL_DOCREADMEDIR=share/mysql/docs" (string-append "-DINSTALL_DOCREADMEDIR=" (assoc-ref %outputs "out")
"-DINSTALL_SUPPORTFILESDIR=share/mysql/support-files" "/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_MYSQLSHAREDIR=share/mysql"
"-DINSTALL_DOCDIR=share/mysql/docs"
"-DINSTALL_SHAREDIR=share") "-DINSTALL_SHAREDIR=share")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -764,19 +777,29 @@ Language.")
'install 'post-install 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (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") (substitute* (string-append out "/bin/mysql_install_db")
(("basedir=\"\"") (("basedir=\"\"")
(string-append "basedir=\"" out "\""))) (string-append "basedir=\"" out "\"")))
;; Remove unneeded files for testing. ;; Remove unneeded files for testing.
(with-directory-excursion out (with-directory-excursion lib
(for-each delete-file-recursively (for-each delete-file-recursively
'("data" "mysql-test" "sql-bench" '("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)"))
;; And static libraries. ;; And static libraries.
(for-each delete-file (find-files "lib" "\\.a$"))) (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)))))) #t))))))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
@ -1544,7 +1567,8 @@ columns, primary keys, unique constraints and relationships.")
#:tests? #f)) #:tests? #f))
(propagated-inputs (propagated-inputs
`(("perl-dbi" ,perl-dbi) `(("perl-dbi" ,perl-dbi)
("mysql" ,mariadb))) ("mysql" ,mariadb "lib")
("mysql-dev" ,mariadb "dev")))
(home-page "https://metacpan.org/release/DBD-mysql") (home-page "https://metacpan.org/release/DBD-mysql")
(synopsis "DBI MySQL interface") (synopsis "DBI MySQL interface")
(description "This package provides a MySQL driver for the Perl5 (description "This package provides a MySQL driver for the Perl5
@ -2662,7 +2686,8 @@ database).")
("mock" ,python-mock) ("mock" ,python-mock)
("py.test" ,python-pytest))) ("py.test" ,python-pytest)))
(inputs (inputs
`(("mysql" ,mariadb) `(("mysql" ,mariadb "lib")
("mysql-dev" ,mariadb "dev")
("libz" ,zlib) ("libz" ,zlib)
("openssl" ,openssl))) ("openssl" ,openssl)))
(home-page "https://github.com/PyMySQL/mysqlclient-python") (home-page "https://github.com/PyMySQL/mysqlclient-python")

View File

@ -11325,7 +11325,8 @@ object has been freed.")
#t))))) #t)))))
(inputs (inputs
`(("emacs-minimal" ,emacs-minimal) `(("emacs-minimal" ,emacs-minimal)
("mariadb" ,mariadb) ("mariadb" ,mariadb "lib")
("mariadb-dev" ,mariadb "dev")
("postgresql" ,postgresql))) ("postgresql" ,postgresql)))
(propagated-inputs (propagated-inputs
`(("emacs-finalize" ,emacs-finalize) `(("emacs-finalize" ,emacs-finalize)

View File

@ -436,7 +436,8 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
("libxrender" ,libxrender) ("libxrender" ,libxrender)
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("lzo" ,lzo) ("lzo" ,lzo)
("mariadb" ,mariadb) ("mariadb" ,mariadb "lib")
("mariadb-dev" ,mariadb "dev")
("openssl" ,openssl) ("openssl" ,openssl)
("pcre" ,pcre) ("pcre" ,pcre)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)

View File

@ -224,7 +224,8 @@ system, and the core design of Django is reused in Grantlee.")
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("libxtst" ,libxtst) ("libxtst" ,libxtst)
("mtdev" ,mtdev) ("mtdev" ,mtdev)
("mariadb" ,mariadb) ("mariadb" ,mariadb "lib")
("mariadb-dev" ,mariadb "dev")
("nss" ,nss) ("nss" ,nss)
("openssl" ,openssl) ("openssl" ,openssl)
("postgresql" ,postgresql) ("postgresql" ,postgresql)
@ -579,7 +580,8 @@ system, and the core design of Django is reused in Grantlee.")
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("libxtst" ,libxtst) ("libxtst" ,libxtst)
("mtdev" ,mtdev) ("mtdev" ,mtdev)
("mariadb" ,mariadb) ("mariadb" ,mariadb "lib")
("mariadb-dev" ,mariadb "dev")
("nss" ,nss) ("nss" ,nss)
("openssl" ,openssl) ("openssl" ,openssl)
("pcre2" ,pcre2) ("pcre2" ,pcre2)

View File

@ -2645,7 +2645,8 @@ specs for Ruby implementations in ruby/spec.")
(invoke "rspec")) (invoke "rspec"))
#t))))) #t)))))
(inputs (inputs
`(("mariadb" ,mariadb) `(("mariadb" ,mariadb "lib")
("mariadb-dev" ,mariadb "dev")
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("ruby-rspec" ,ruby-rspec) `(("ruby-rspec" ,ruby-rspec)