* [bug#38298] [PATCH 2/3] gnu: Add libdbi-drivers.
2019-11-20 12:46 ` [bug#38298] [PATCH 1/3] gnu: Add libdbi Guillaume Le Vaillant
@ 2019-11-20 12:46 ` Guillaume Le Vaillant
2019-11-20 12:46 ` [bug#38298] [PATCH 3/3] gnu: gnucash: Activate database support Guillaume Le Vaillant
1 sibling, 0 replies; 5+ messages in thread
From: Guillaume Le Vaillant @ 2019-11-20 12:46 UTC (permalink / raw)
To: 38298; +Cc: Guillaume Le Vaillant
* gnu/packages/databases.scm (libdbi-drivers): New variable.
---
gnu/packages/databases.scm | 68 ++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 2ccaae205c..4be5912022 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3192,3 +3192,71 @@ programmers can leverage the power of multiple databases and multiple
simultaneous database connections by using this framework.")
(home-page "http://libdbi.sourceforge.net/")
(license license:lgpl2.1+)))
+
+(define-public libdbi-drivers
+ (package
+ (name "libdbi-drivers")
+ (version "0.9.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/libdbi-drivers/"
+ "libdbi-drivers/libdbi-drivers-" version
+ "/libdbi-drivers-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("inetutils" ,inetutils)
+ ("glibc-locales" ,glibc-locales)))
+ (inputs
+ `(("libdbi" ,libdbi)
+ ("mysql" ,mariadb)
+ ("postgresql" ,postgresql)
+ ("sqlite" ,sqlite)))
+ (arguments
+ `(#:configure-flags
+ (let ((libdbi (assoc-ref %build-inputs "libdbi"))
+ (mysql (assoc-ref %build-inputs "mysql"))
+ (postgresql (assoc-ref %build-inputs "postgresql"))
+ (sqlite (assoc-ref %build-inputs "sqlite")))
+ (list "--disable-docs"
+ (string-append "--with-dbi-incdir=" libdbi "/include")
+ (string-append "--with-dbi-libdir=" libdbi "/lib")
+ "--with-mysql"
+ (string-append "--with-mysql-incdir=" mysql "/include/mysql")
+ (string-append "--with-mysql-libdir=" mysql "/lib")
+ "--with-pgsql"
+ (string-append "--with-pgsql-incdir=" postgresql "/include")
+ (string-append "--with-pgsql-libdir=" postgresql "/lib")
+ "--with-sqlite3"
+ (string-append "--with-sqlite-incdir=" sqlite "/include")
+ (string-append "--with-sqlite-libdir=" sqlite "/lib")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "tests/test_mysql.sh"
+ (("^MYMYSQLD=.*")
+ (string-append "MYMYSQLD="
+ (assoc-ref inputs "mysql")
+ "/bin/mysqld")))
+ #t))
+ (add-after 'install 'remove-empty-directories
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((var (string-append (assoc-ref outputs "out") "/var")))
+ (delete-file-recursively var))
+ #t)))))
+ (synopsis "Database drivers for the libdbi framework")
+ (description
+ "The @code{libdbi-drivers} library provides the database specific drivers
+for the @code{libdbi} framework.
+
+The drivers officially supported by @code{libdbi} are:
+@itemize
+@item MySQL,
+@item PostgreSQL,
+@item SQLite.
+@end itemize")
+ (home-page "http://libdbi-drivers.sourceforge.net/")
+ (license license:lgpl2.1+)))
--
2.24.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [bug#38298] [PATCH 3/3] gnu: gnucash: Activate database support.
2019-11-20 12:46 ` [bug#38298] [PATCH 1/3] gnu: Add libdbi Guillaume Le Vaillant
2019-11-20 12:46 ` [bug#38298] [PATCH 2/3] gnu: Add libdbi-drivers Guillaume Le Vaillant
@ 2019-11-20 12:46 ` Guillaume Le Vaillant
1 sibling, 0 replies; 5+ messages in thread
From: Guillaume Le Vaillant @ 2019-11-20 12:46 UTC (permalink / raw)
To: 38298; +Cc: Guillaume Le Vaillant
* gnu/packages/gnucash.scm (gnucash)[inputs]: Add libdbi and libdbi-drivers.
[arguments]: Remove '-DWITH_SQL=OFF' from 'configure-flags' and add
'GNC_DBD_DIR' to program wrapping.
---
gnu/packages/gnucash.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index de916a8829..af017e108d 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,6 +34,7 @@
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
+ #:use-module (gnu packages databases)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
#:use-module (gnu packages gnome)
@@ -70,6 +72,8 @@
("icu4c" ,icu4c)
("glib" ,glib)
("gtk" ,gtk+)
+ ("libdbi" ,libdbi)
+ ("libdbi-drivers" ,libdbi-drivers)
("libgnomecanvas" ,libgnomecanvas)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
@@ -89,8 +93,7 @@
(arguments
`(#:test-target "check"
#:configure-flags
- (list "-DWITH_OFX=OFF" ; libofx is not available yet
- "-DWITH_SQL=OFF") ; without dbi.h
+ (list "-DWITH_OFX=OFF") ; libofx is not available yet
#:make-flags '("GUILE_AUTO_COMPILE=0")
#:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
@@ -147,6 +150,10 @@
(for-each (lambda (prog)
(wrap-program (string-append (assoc-ref outputs "out")
"/bin/" prog)
+ `("GNC_DBD_DIR" =
+ (,(string-append
+ (assoc-ref inputs "libdbi-drivers")
+ "/lib/dbd")))
`("PERL5LIB" ":" prefix
,(map (lambda (o)
(string-append o "/lib/perl5/site_perl/"
--
2.24.0
^ permalink raw reply related [flat|nested] 5+ messages in thread