summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorJakub Kądziołka <kuba@kadziolka.net>2020-03-29 17:38:12 +0200
committerJakub Kądziołka <kuba@kadziolka.net>2020-03-29 17:53:56 +0200
commitd96ad7fa1dcb12082db1acc07876f1ff219489df (patch)
treeaad24d97631dd4cc297a0c0d31703fef04c9a43e /gnu/packages
parent033df23680cce1b3ccd9c83b97d8c200176cdb0a (diff)
gnu: ntl: Update to 11.4.3.
* gnu/packages/algebra.scm (ntl): Update to 11.4.3. [source], [home-page]: Use https URL. [source](snippet): Remove bundled libtool. [inputs]: Add gf2x. [arguments](configure): Use invoke insteam of system*. Remove the no longer supported WIZARD argument. Add a LIBTOOL parameter, since it's now required. Enable building with gf2x. Pass the paths to dependencies explicitly. (eclib)[inputs]: Remove the transitive dependency on gmp, which is now handled automatically by libtool.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/algebra.scm39
1 files changed, 23 insertions, 16 deletions
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 0bec53743d..af50c2d775 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -558,42 +558,50 @@ these types and other mathematical functions.")
(define-public ntl
(package
(name "ntl")
- (version "9.7.0")
+ (version "11.4.3")
(source (origin
(method url-fetch)
- (uri (string-append "http://shoup.net/ntl/ntl-"
+ (uri (string-append "https://shoup.net/ntl/ntl-"
version ".tar.gz"))
- (sha256 (base32
- "115frp5flyvw9wghz4zph1b3llmr5nbxk1skgsggckr81fh3gmxq"))))
+ (sha256
+ (base32
+ "1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "src/libtool-origin")
+ #t))))
(build-system gnu-build-system)
(native-inputs
`(("libtool" ,libtool)
("perl" ,perl))) ; for configuration
- ;; FIXME: Add optional input gf2x once available; then also add
- ;; configure flag "NTL_GF2X_LIB=on".
(inputs
- `(("gmp" ,gmp)))
+ `(("gmp" ,gmp)
+ ("gf2x" ,gf2x)))
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
(chdir "src")
- (system* "./configure"
+ (invoke "./configure"
(string-append "PREFIX=" (assoc-ref outputs "out"))
+ (string-append "LIBTOOL=" (assoc-ref inputs "libtool") "/bin/libtool")
+ ;; set the library prefixes explicitly so that they get
+ ;; embedded in the .la file
+ (string-append "GMP_PREFIX=" (assoc-ref inputs "gmp"))
+ (string-append "GF2X_PREFIX=" (assoc-ref inputs "gf2x"))
;; Do not build especially for the build machine.
"NATIVE=off"
- ;; Also do not tune to the build machine.
- "WIZARD=off"
- "SHARED=on")
- #t)))))
+ "NTL_GF2X_LIB=on"
+ "SHARED=on"))))))
(synopsis "C++ library for number theory")
(description
"NTL is a C++ library providing data structures and algorithms
for manipulating signed, arbitrary length integers, and for vectors,
matrices, and polynomials over the integers and over finite fields.")
(license license:gpl2+)
- (home-page "http://shoup.net/ntl/")))
+ (home-page "https://shoup.net/ntl/")))
(define-public singular
(package
@@ -1451,8 +1459,7 @@ of M4RI from F_2 to F_{2^e}.")
("automake" ,automake)
("libtool" ,libtool)))
(inputs
- `(("gmp" ,gmp)
- ("ntl" ,ntl)
+ `(("ntl" ,ntl)
("pari-gp" ,pari-gp)))
(synopsis "Ranks of elliptic curves and modular symbols")
(description "The eclib package includes mwrank (for 2-descent on