nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: bdb: Use invoke. 

* gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Use invoke in the
custom configure phase.
This commit is contained in:
Mark H Weaver 2018-03-23 23:52:16 -04:00
parent 13f5a0dc80
commit 5114c83a24
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
gnu/packages/databases.scm
View File

@ -253,23 +253,22 @@ standard Go idioms.")
(("docdir[[:blank:]]*=.*") (("docdir[[:blank:]]*=.*")
(string-append "docdir = " doc "/share/doc/bdb"))) (string-append "docdir = " doc "/share/doc/bdb")))
(zero? (invoke "./dist/configure"
(system* "./dist/configure" (string-append "--prefix=" out)
(string-append "--prefix=" out) (string-append "CONFIG_SHELL=" (which "bash"))
(string-append "CONFIG_SHELL=" (which "bash")) (string-append "SHELL=" (which "bash"))
(string-append "SHELL=" (which "bash"))
;; Remove 7 MiB of .a files. ;; Remove 7 MiB of .a files.
"--disable-static" "--disable-static"
;; The compatibility mode is needed by some packages, ;; The compatibility mode is needed by some packages,
;; notably iproute2. ;; notably iproute2.
"--enable-compat185" "--enable-compat185"
;; The following flag is needed so that the inclusion ;; The following flag is needed so that the inclusion
;; of db_cxx.h into C++ files works; it leads to ;; of db_cxx.h into C++ files works; it leads to
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
"--enable-cxx")))))))) "--enable-cxx")))))))
(synopsis "Berkeley database") (synopsis "Berkeley database")
(description (description
"Berkeley DB is an embeddable database allowing developers the choice of "Berkeley DB is an embeddable database allowing developers the choice of
@ -307,28 +306,27 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
(("docdir[[:blank:]]*=.*") (("docdir[[:blank:]]*=.*")
(string-append "docdir = " doc "/share/doc/bdb"))) (string-append "docdir = " doc "/share/doc/bdb")))
(zero? (invoke "./dist/configure"
(system* "./dist/configure" (string-append "--prefix=" out)
(string-append "--prefix=" out) (string-append "CONFIG_SHELL=" (which "bash"))
(string-append "CONFIG_SHELL=" (which "bash")) (string-append "SHELL=" (which "bash"))
(string-append "SHELL=" (which "bash"))
;; Bdb doesn't recognize aarch64 as an architecture. ;; Bdb doesn't recognize aarch64 as an architecture.
,@(if (string=? "aarch64-linux" (%current-system)) ,@(if (string=? "aarch64-linux" (%current-system))
'("--build=aarch64-unknown-linux-gnu") '("--build=aarch64-unknown-linux-gnu")
'()) '())
;; Remove 7 MiB of .a files. ;; Remove 7 MiB of .a files.
"--disable-static" "--disable-static"
;; The compatibility mode is needed by some packages, ;; The compatibility mode is needed by some packages,
;; notably iproute2. ;; notably iproute2.
"--enable-compat185" "--enable-compat185"
;; The following flag is needed so that the inclusion ;; The following flag is needed so that the inclusion
;; of db_cxx.h into C++ files works; it leads to ;; of db_cxx.h into C++ files works; it leads to
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
"--enable-cxx")))))))))) "--enable-cxx")))))))))
(define-public es-dump-restore (define-public es-dump-restore
(package (package