me/guix
Archived
1
0
Fork 0
Code Activity

gnu: MariaDB: Do not propagate OpenSSL.

Browse source 
* gnu/packages/databases.scm (mariadb)[propagated-inputs]: Remove.
[inputs]: Add OPENSSL-1.0.
[arguments]: Add absolute references to OpenSSL in "post-install" phase.
This commit is contained in:
Marius Bakke 2019-12-10 16:19:23 +01:00
parent 3d19c77d74
commit 939c5b2cb6
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/databases.scm
View file

@ -851,10 +851,11 @@ Language.")
#t)) #t))
(add-after (add-after
'install 'post-install 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(dev (assoc-ref outputs "dev")) (dev (assoc-ref outputs "dev"))
(lib (assoc-ref outputs "lib"))) (lib (assoc-ref outputs "lib"))
(openssl (assoc-ref inputs "openssl")))
(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 "\"")))
@ -876,6 +877,14 @@ Language.")
(string-append dev "/share/pkgconfig")) (string-append dev "/share/pkgconfig"))
(rename-file (string-append out "/bin/mysql_config") (rename-file (string-append out "/bin/mysql_config")
(string-append dev "/bin/mysql_config")) (string-append dev "/bin/mysql_config"))
;; Embed an absolute reference to OpenSSL in mysql_config
;; and the pkg-config file to avoid propagation.
(substitute* (list (string-append dev "/bin/mysql_config")
(string-append dev "/share/pkgconfig/mariadb.pc"))
(("-lssl -lcrypto" all)
(string-append "-L" openssl "/lib " all)))
#t)))))) #t))))))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
@ -889,13 +898,11 @@ Language.")
("libaio" ,libaio) ("libaio" ,libaio)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("openssl" ,openssl-1.0)
("pam" ,linux-pam) ("pam" ,linux-pam)
("pcre" ,pcre) ("pcre" ,pcre)
("xz" ,xz) ("xz" ,xz)
("zlib" ,zlib))) ("zlib" ,zlib)))
(propagated-inputs
;; mariadb.pc says -lssl -lcrypto, so propagate it.
`(("openssl" ,openssl-1.0)))
;; The test suite is very resource intensive and can take more than three ;; The test suite is very resource intensive and can take more than three
;; hours on a x86_64 system. Give slow and busy machines some leeway. ;; hours on a x86_64 system. Give slow and busy machines some leeway.
(properties '((timeout . 64800))) ;18 hours (properties '((timeout . 64800))) ;18 hours