diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-11-13 00:34:16 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-11-13 00:34:16 +0100 |
| commit | 2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b (patch) | |
| tree | b0f12de9371ebbd806214df841cf3a1c116d5431 /gnu/packages/databases.scm | |
| parent | 15abcabe4e1d34416714eae66dba32ff96d05a6f (diff) | |
| parent | de7da4e5d14a1acace1a89d9c520d336eecc7e45 (diff) | |
| download | guix-2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b.tar.gz guix-2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b.zip | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/databases.scm')
| -rw-r--r-- | gnu/packages/databases.scm | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dde566b754..0323a51838 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -91,7 +91,7 @@ ("python" ,python-2) ("autoconf" ,autoconf) ("automake" ,automake) - ("gettext" ,gnu-gettext) + ("gettext" ,gettext-minimal) ("libtool" ,libtool) ("pcre" ,pcre "bin") ;for 'pcre-config' ("pkg-config" ,pkg-config))) @@ -405,7 +405,24 @@ pictures, sounds, or video.") #:configure-flags (list (string-append "--with-bash-headers=" (assoc-ref %build-inputs "bash:include") - "/include/bash")))) + "/include/bash")) + + #:phases (modify-phases %standard-phases + (add-before 'build 'set-bash4.4-header-location + (lambda _ + (substitute* "bash/Makefile.in" + ;; Adjust the header search path for Bash + ;; 4.4 in accordance with 'bash.pc'. + (("AM_CPPFLAGS = (.*)$" _ rest) + (string-append "AM_CPPFLAGS = " + "-I$(BASH_HEADERS)/include " + rest)) + + ;; Install to PREFIX/lib/bash to match Bash + ;; 4.4's search path. + (("^libdir = .*$") + "libdir = @libdir@/bash\n")) + #t))))) (native-inputs `(("emacs" ,emacs-minimal) ("bc" ,bc) @@ -490,7 +507,7 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.12.2") + (version "3.14.1") (source (origin (method url-fetch) ;; TODO: Download from sqlite.org once this bug : @@ -521,15 +538,17 @@ for example from a shell script.") )) (sha256 (base32 - "1fwss0i2lixv39b27gkqiibdd2syym90wh3qbiaxnfgxk867f07x")))) + "19j73j44akqgc6m82wm98yvnmm3mfzmfqr8mp3n7n080d53q4wdw")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments `(#:configure-flags - ;; Add -DSQLITE_SECURE_DELETE and -DSQLITE_ENABLE_UNLOCK_NOTIFY to - ;; CFLAGS. GNU Icecat will refuse to use the system SQLite unless these - ;; options are enabled. - '("CFLAGS=-O2 -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY"))) + ;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_UNLOCK_NOTIFY and + ;; -DSQLITE_ENABLE_DBSTAT_VTAB to CFLAGS. GNU Icecat will refuse + ;; to use the system SQLite unless these options are enabled. + (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " + "-DSQLITE_ENABLE_UNLOCK_NOTIFY " + "-DSQLITE_ENABLE_DBSTAT_VTAB")))) (home-page "http://www.sqlite.org/") (synopsis "The SQLite database management system") (description |