[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/13: gnu: bdb: Use invoke.
From: |
Mark H. Weaver |
Subject: |
01/13: gnu: bdb: Use invoke. |
Date: |
Sun, 25 Mar 2018 05:03:15 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 5114c83a24bd3d974ac740858c2091e24f93f269
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 23 23:52:16 2018 -0400
gnu: bdb: Use invoke.
* gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Use invoke in the
custom configure phase.
---
gnu/packages/databases.scm | 68 ++++++++++++++++++++++------------------------
1 file changed, 33 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 6dcebfb..eb00ff5 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -253,23 +253,22 @@ standard Go idioms.")
(("docdir[[:blank:]]*=.*")
(string-append "docdir = " doc "/share/doc/bdb")))
- (zero?
- (system* "./dist/configure"
- (string-append "--prefix=" out)
- (string-append "CONFIG_SHELL=" (which "bash"))
- (string-append "SHELL=" (which "bash"))
-
- ;; Remove 7 MiB of .a files.
- "--disable-static"
-
- ;; The compatibility mode is needed by some packages,
- ;; notably iproute2.
- "--enable-compat185"
-
- ;; The following flag is needed so that the inclusion
- ;; of db_cxx.h into C++ files works; it leads to
- ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
- "--enable-cxx"))))))))
+ (invoke "./dist/configure"
+ (string-append "--prefix=" out)
+ (string-append "CONFIG_SHELL=" (which "bash"))
+ (string-append "SHELL=" (which "bash"))
+
+ ;; Remove 7 MiB of .a files.
+ "--disable-static"
+
+ ;; The compatibility mode is needed by some packages,
+ ;; notably iproute2.
+ "--enable-compat185"
+
+ ;; The following flag is needed so that the inclusion
+ ;; of db_cxx.h into C++ files works; it leads to
+ ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
+ "--enable-cxx")))))))
(synopsis "Berkeley database")
(description
"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:]]*=.*")
(string-append "docdir = " doc "/share/doc/bdb")))
- (zero?
- (system* "./dist/configure"
- (string-append "--prefix=" out)
- (string-append "CONFIG_SHELL=" (which "bash"))
- (string-append "SHELL=" (which "bash"))
+ (invoke "./dist/configure"
+ (string-append "--prefix=" out)
+ (string-append "CONFIG_SHELL=" (which "bash"))
+ (string-append "SHELL=" (which "bash"))
- ;; Bdb doesn't recognize aarch64 as an architecture.
- ,@(if (string=? "aarch64-linux" (%current-system))
- '("--build=aarch64-unknown-linux-gnu")
- '())
+ ;; Bdb doesn't recognize aarch64 as an architecture.
+ ,@(if (string=? "aarch64-linux" (%current-system))
+ '("--build=aarch64-unknown-linux-gnu")
+ '())
- ;; Remove 7 MiB of .a files.
- "--disable-static"
+ ;; Remove 7 MiB of .a files.
+ "--disable-static"
- ;; The compatibility mode is needed by some packages,
- ;; notably iproute2.
- "--enable-compat185"
+ ;; The compatibility mode is needed by some packages,
+ ;; notably iproute2.
+ "--enable-compat185"
- ;; The following flag is needed so that the inclusion
- ;; of db_cxx.h into C++ files works; it leads to
- ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
- "--enable-cxx"))))))))))
+ ;; The following flag is needed so that the inclusion
+ ;; of db_cxx.h into C++ files works; it leads to
+ ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
+ "--enable-cxx")))))))))
(define-public es-dump-restore
(package
- branch core-updates updated (13f5a0d -> 927c52c), Mark H. Weaver, 2018/03/25
- 02/13: gnu: binutils-vc4: Use invoke., Mark H. Weaver, 2018/03/25
- 03/13: gnu: mkfontdir: Return #t from all phases., Mark H. Weaver, 2018/03/25
- 07/13: gnu: wireless-regdb: Inhibit gzip timestamp., Mark H. Weaver, 2018/03/25
- 01/13: gnu: bdb: Use invoke.,
Mark H. Weaver <=
- 06/13: gnu: xf86-video-intel: Fix error during bootstrap., Mark H. Weaver, 2018/03/25
- 08/13: gnu: asciidoc: Restore custom 'bootstrap' phase., Mark H. Weaver, 2018/03/25
- 09/13: gnu: crda: Inhibit gzip timestamp., Mark H. Weaver, 2018/03/25
- 10/13: gnu: make-bootstrap: Adapt glibc-bootstrap-system.patch for glibc-2.27., Mark H. Weaver, 2018/03/25
- 05/13: gnu: shadow: Return #t from all phases., Mark H. Weaver, 2018/03/25
- 11/13: gnu: perl-boot0: Return #t from all phases., Mark H. Weaver, 2018/03/25
- 12/13: gnu: libva: Return #t from all phases., Mark H. Weaver, 2018/03/25
- 13/13: gnu: libselinux: Use invoke., Mark H. Weaver, 2018/03/25
- 04/13: gnu: pulseaudio: Fix build with glibc-2.27., Mark H. Weaver, 2018/03/25