ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 06:36:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sbcl-clsql: Build with mariadb.

Browse source 
* gnu/packages/lisp-xyz.scm (sbcl-clsql)[inputs]: Remove mysql. Add
mariadb:dev, mariadb:lib.
[arguments]: Adjust custom 'build-helper-library phase to build with
and link to mariadb.
This commit is contained in:
Efraim Flashner 2023-04-17 16:16:55 +03:00
parent 5a43894247
commit fee5561746
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/lisp-xyz.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018-2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017-2020, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
@ -13178,7 +13178,8 @@ (define-public sbcl-clsql
(inputs
`(("cffi" ,sbcl-cffi)
("md5" ,sbcl-md5)
("mysql" ,mysql)
("mariadb-dev" ,mariadb "dev")
("mariadb-lib" ,mariadb "lib")
("postgresql" ,postgresql)
("postmodern" ,sbcl-postmodern)
("sqlite" ,sqlite)
@ -13224,15 +13225,16 @@ (define-public sbcl-clsql
lib))
(substitute* "db-mysql/mysql-loader.lisp"
(("libmysqlclient" all)
(string-append (assoc-ref inputs "mysql") "/lib/" all))
(string-append (assoc-ref inputs "mariadb-lib") "/lib/" all))
(("clsql-mysql-system::\\*library-file-dir\\*")
lib)))
#t))
(add-before 'build 'build-helper-library
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((mysql (assoc-ref inputs "mysql"))
(inc-dir (string-append mysql "/include/mysql"))
(lib-dir (string-append mysql "/lib"))
(let* ((mariadb-dev (assoc-ref inputs "mariadb-dev"))
(mariadb-lib (assoc-ref inputs "mariadb-lib"))
(inc-dir (string-append mariadb-dev "/include/mysql"))
(lib-dir (string-append mariadb-lib "/lib"))
(shared-lib-dir (string-append (assoc-ref outputs "out")
"/lib"))
(shared-lib (string-append shared-lib-dir
@ -13242,7 +13244,7 @@ (define-public sbcl-clsql
"-I" inc-dir
"db-mysql/clsql_mysql.c"
"-Wl,-soname=clsql_mysql"
"-L" lib-dir "-lmysqlclient" "-lz"
"-L" lib-dir "-lmariadb" "-lz"
"-o" shared-lib)
#t)))
(add-after 'unpack 'fix-tests