From fee5561746cf3b53c557420a5a32aa9051507588 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Apr 2023 16:16:55 +0300 Subject: gnu: sbcl-clsql: Build with mariadb. * 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(-) (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b9d0a0fddb..7947a3d9ef 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017 Andy Patterson ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus -;;; Copyright © 2017, 2018-2020, 2022 Efraim Flashner +;;; Copyright © 2017-2020, 2022, 2023 Efraim Flashner ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong @@ -13178,7 +13178,8 @@ interface for MySQL, PostgreSQL and SQLite.") (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 @@ interface for MySQL, PostgreSQL and SQLite.") 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 @@ interface for MySQL, PostgreSQL and SQLite.") "-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 -- cgit v1.2.3