01/01: gnu: virtuoso-ose: Unbundle zlib and build with readline support.

[Roel Janssen]

roelj pushed a commit to branch master
in repository guix.

commit 6d09a7b5ecf01733b4cffb9d03fe08ad3c81d659
Author: Roel Janssen <address@hidden>
Date:   Tue Apr 3 13:07:21 2018 +0200

    gnu: virtuoso-ose: Unbundle zlib and build with readline support.
    
    * gnu/packages/databases.scm (virtuoso-ose):
      [inputs]: Add zlib, and readline;
      [arguments]: Add --without-internal-zlib, and --with-readline.
---
 gnu/packages/databases.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 0622b5f..b08ac60 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2016 Christopher Allan Webber <address@hidden>
 ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016, 2017 Nils Gillmann <address@hidden>
-;;; Copyright © 2016, 2017 Roel Janssen <address@hidden>
+;;; Copyright © 2016, 2017, 2018 Roel Janssen <address@hidden>
 ;;; Copyright © 2016 David Craven <address@hidden>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
 ;;; Copyright © 2016 Andy Patterson <address@hidden>
@@ -2040,10 +2040,16 @@ implementation for Python.")
         (base32 "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f)) ; Tests require a network connection.
+     `(#:tests? #f ; Tests require a network connection.
+       ;; TODO: Removing the libsrc/zlib source directory breaks the build.
+       ;; This indicates that the internal zlib code may still be used.
+       #:configure-flags '("--without-internal-zlib"
+                           "--with-readline")))
     (inputs
      `(("openssl" ,openssl)
-       ("net-tools" ,net-tools)))
+       ("net-tools" ,net-tools)
+       ("readline" ,readline)
+       ("zlib" ,zlib)))
     (home-page "http://vos.openlinksw.com/owiki/wiki/VOS/";)
     (synopsis "Multi-model database system")
     (description "Virtuoso is a scalable cross-platform server that combines