TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: MariaDB: Remove input labels.

Browse source 
* gnu/packages/databases.scm (mariadb)[arguments]: Don't reference OpenSSL by
label.
[inputs]: Remove labels.
This commit is contained in:
Marius Bakke 2022-10-28 21:58:05 +02:00 committed by Maxim Cournoyer
parent 88d7612aaa
commit aeed9d884e
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gnu/packages/databases.scm
View file

@ -1058,13 +1058,12 @@ (define-public mariadb
"--skip-rpl" "--skip-rpl"
"--skip-test-list=unstable-tests")) "--skip-test-list=unstable-tests"))
(format #t "test suite not run~%")))) (format #t "test suite not run~%"))))
(add-after (add-after 'install 'post-install
'install 'post-install (lambda* (#:key inputs 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"))) (openssl (dirname (search-input-file inputs "lib/libssl.so"))))
(substitute* (list (string-append out "/bin/mariadb-install-db") (substitute* (list (string-append out "/bin/mariadb-install-db")
(string-append out "/bin/mysql_install_db")) (string-append out "/bin/mysql_install_db"))
(("basedir=\"\"") (("basedir=\"\"")
@ -1102,20 +1101,20 @@ (define-public mariadb
(substitute* (list (string-append dev "/bin/mysql_config") (substitute* (list (string-append dev "/bin/mysql_config")
(string-append dev "/lib/pkgconfig/mariadb.pc")) (string-append dev "/lib/pkgconfig/mariadb.pc"))
(("-lssl -lcrypto" all) (("-lssl -lcrypto" all)
(string-append "-L" openssl "/lib " all))))))))) (string-append "-L" openssl " " all)))))))))
(native-inputs (native-inputs
(list bison perl)) (list bison perl))
(inputs (inputs
`(("fmt" ,fmt) (list fmt
("jemalloc" ,jemalloc) jemalloc
("libaio" ,libaio) libaio
("libxml2" ,libxml2) libxml2
("ncurses" ,ncurses) ncurses
("openssl" ,openssl) openssl
("pam" ,linux-pam) linux-pam
("pcre2" ,pcre2) pcre2
("xz" ,xz) xz
("zlib" ,zlib))) zlib))
;; 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