diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2017-04-05 21:23:41 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2017-04-05 21:23:41 +0200 |
| commit | b28187cd0ca75a17a12dce9bfb5855d8fbf61eb3 (patch) | |
| tree | 5790d9b4f809f6421c659a2dc70ab2f2eb4ca1ab | |
| parent | cd381c317b03d7ff4936e0006c277e7126500602 (diff) | |
| download | gnu-guix-b28187cd0ca75a17a12dce9bfb5855d8fbf61eb3.tar gnu-guix-b28187cd0ca75a17a12dce9bfb5855d8fbf61eb3.tar.gz | |
Revert "gnu: bc: Update to 1.07."
This reverts commit dfee7daedb760f1b1d7506829ca31633f4173356. It causes
the linux-libre@4.9 build to hang (command-line usage works fine).
| -rw-r--r-- | gnu/packages/algebra.scm | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 96720bd593..ab73a6e2e5 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -26,7 +26,6 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) - #:use-module (gnu packages ed) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages gl) @@ -40,7 +39,6 @@ #:use-module (gnu packages readline) #:use-module (gnu packages shells) #:use-module (gnu packages tex) - #:use-module (gnu packages texinfo) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) @@ -470,22 +468,35 @@ binary.") (define-public bc (package (name "bc") - (version "1.07") + (version "1.06") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz")) (sha256 (base32 - "1b852b39y43zrbya7d8civ7vmdbfap5v1ivc70ypr3bj7b1izksm")))) + "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf")))) (build-system gnu-build-system) - (inputs - `(("readline" ,readline))) - (native-inputs - `(("ed" ,ed) - ("flex" ,flex) - ("texinfo" ,texinfo))) + (inputs `(("readline" ,readline))) + (native-inputs `(("flex" ,flex))) (arguments - '(#:configure-flags + '(#:phases + (alist-replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; This old `configure' script doesn't support + ;; variables passed as arguments. + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" (which "bash")) + (zero? + (system* + "./configure" + (string-append "--prefix=" out) + ;; By default, man and info pages are put in + ;; PREFIX/{man,info}, but we want them in + ;; PREFIX/share/{man,info}. + (string-append "--mandir=" out "/share/man") + (string-append "--infodir=" out "/share/info"))))) + %standard-phases) + #:configure-flags (list "--with-readline"))) (home-page "https://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") |