diff mbox series

[bug#62903,7/8] gnu: sbcl-clsql: Build with mariadb.

Message ID 25d0aa82bea0a54ae40f3b1914d1865d2c4b7139.1681738065.git.efraim@flashner.co.il
State New
Headers show
Series Remove mysql | expand

Commit Message

Efraim Flashner April 17, 2023, 1:32 p.m. UTC 
* 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.
---
 gnu/packages/lisp-xyz.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 5f64809b28..d1ed5629e3 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -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, 2018-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>
@@ -13138,7 +13138,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)
@@ -13184,15 +13185,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
@@ -13202,7 +13204,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