[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62903] [PATCH 7/8] gnu: sbcl-clsql: Build with mariadb.
From: |
Efraim Flashner |
Subject: |
[bug#62903] [PATCH 7/8] gnu: sbcl-clsql: Build with mariadb. |
Date: |
Mon, 17 Apr 2023 16:32:28 +0300 |
* 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 --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
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
- [bug#62903] [PATCH 0/8] Remove mysql, Efraim Flashner, 2023/04/17
- [bug#62903] [PATCH 2/8] gnu: ghc-mysql: Build with mariadb., Efraim Flashner, 2023/04/17
- [bug#62903] [PATCH 1/8] gnu: sysbench: Build with mariadb., Efraim Flashner, 2023/04/17
- [bug#62903] [PATCH 5/8] gnu: ulogd: Build with mariadb., Efraim Flashner, 2023/04/17
- [bug#62903] [PATCH 4/8] gnu: inspircd: Build with mariadb., Efraim Flashner, 2023/04/17
- [bug#62903] [PATCH 3/8] gnu: neko: Build with mariadb., Efraim Flashner, 2023/04/17
- [bug#62903] [PATCH 7/8] gnu: sbcl-clsql: Build with mariadb.,
Efraim Flashner <=
- [bug#62903] [PATCH 8/8] gnu: cl-clsql: Build with mariadb., Efraim Flashner, 2023/04/17
- [bug#62903] [PATCH 6/8] gnu: opensmtpd-extras: Build with mariadb., Efraim Flashner, 2023/04/17
- [bug#62903] [PATCH 0/8] Remove mysql, Andreas Enge, 2023/04/19