From 6d09a7b5ecf01733b4cffb9d03fe08ad3c81d659 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 3 Apr 2018 13:07:21 +0200 Subject: 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(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 0622b5f37c..b08ac60f8c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Nils Gillmann -;;; Copyright © 2016, 2017 Roel Janssen +;;; Copyright © 2016, 2017, 2018 Roel Janssen ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Andy Patterson @@ -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 -- cgit 1.4.1 From ea09f99f7fcdde57589f83cfc66e813b084013f9 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Wed, 4 Apr 2018 14:54:02 +0200 Subject: gnu: 4store: Remove preprocessor directive. * gnu/packages/databases.scm (4store): Add patch to remove preprocessor directive. * gnu/packages/patches/4store-unset-preprocessor-directive.patch: New file. * gnu/local.mk: Register patch. --- gnu/local.mk | 1 + gnu/packages/databases.scm | 3 ++- .../patches/4store-unset-preprocessor-directive.patch | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/4store-unset-preprocessor-directive.patch (limited to 'gnu/packages/databases.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 2705fb37a5..1481d07066 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -544,6 +544,7 @@ MODULES_NOT_COMPILED += \ patchdir = $(guilemoduledir)/%D%/packages/patches dist_patch_DATA = \ %D%/packages/patches/4store-fix-buildsystem.patch \ + %D%/packages/patches/4store-unset-preprocessor-directive.patch \ %D%/packages/patches/a2ps-CVE-2001-1593.patch \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b08ac60f8c..30b9320c2a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -125,7 +125,8 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "004fmcf1w75zhc1x3zc6kc97j4jqn2v5nhk6yb3z3cpfrhzi9j50")) - (patches (list (search-patch "4store-fix-buildsystem.patch"))))) + (patches (search-patches "4store-unset-preprocessor-directive.patch" + "4store-fix-buildsystem.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) diff --git a/gnu/packages/patches/4store-unset-preprocessor-directive.patch b/gnu/packages/patches/4store-unset-preprocessor-directive.patch new file mode 100644 index 0000000000..c4b1d6eda4 --- /dev/null +++ b/gnu/packages/patches/4store-unset-preprocessor-directive.patch @@ -0,0 +1,16 @@ +This patch removes the _XOPEN_SOURCE preprocessor directive as it does not seem to be needed. +Setting it removes the definition of strdup, which is used in filter-datatypes.c. + +Patch by Roel Janssen +*** a/src/frontend/filter-datatypes.c 1970-01-01 01:00:00.000000000 +0100 +--- b/src/frontend/filter-datatypes.c 2018-04-03 17:39:23.177905592 +0200 +*************** +*** 18,24 **** + * Copyright (C) 2006 Steve Harris for Garlik + */ + +- #define _XOPEN_SOURCE + #include + #include + #include +--- 18,23 ---- -- cgit 1.4.1 From f560acf8d9d86002f38ef69c39bd45dde24f0220 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 5 Apr 2018 05:41:43 +0200 Subject: gnu: lmdb: Update to 0.9.22. * gnu/packages/databases.scm (lmdb): Update to 0.9.22. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 30b9320c2a..5cf0adac29 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1687,14 +1687,14 @@ database. Various higher level database abstractions.") (define-public lmdb (package (name "lmdb") - (version "0.9.21") + (version "0.9.22") (source (origin (method url-fetch) (uri (string-append "https://github.com/LMDB/lmdb/archive/" "LMDB_" version ".tar.gz")) (sha256 (base32 - "0ndmj07hkm2ic60z1f4rdscxs7pq45hk9fibjyv5nhfclhsvd1qi")))) + "0a7a8535csrvw71mrgx680m5d17bnxmmhcccij30idifi1cpi4pk")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit 1.4.1 From 4bac91e1d895b2691525da109a4218a50c784823 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 5 Apr 2018 06:03:15 +0200 Subject: gnu: perl-db-file: Update to 1.841. * gnu/packages/databases.scm (perl-db-file): Update to 1.841. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5cf0adac29..ecbb815246 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1655,7 +1655,7 @@ database. Various higher level database abstractions.") (define-public perl-db-file (package (name "perl-db-file") - (version "1.840") + (version "1.841") (source (origin (method url-fetch) @@ -1665,7 +1665,7 @@ database. Various higher level database abstractions.") ".tar.gz")) (sha256 (base32 - "1i5jz85z4hpx15lw6ix27pyvrf0ziyh4z33lii4d3wnhz83lg1mp")))) + "11fks42kgscpia0mxx4lc9krm7q4gv6w7m5h3m2jr3dl7viv36hn")))) (build-system perl-build-system) (inputs `(("bdb" ,bdb))) (native-inputs `(("perl-test-pod" ,perl-test-pod))) -- cgit 1.4.1