Archived
1
0
Fork 0

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.
This commit is contained in:
Jakub Kądziołka 2020-03-29 17:38:12 +02:00
parent 033df23680
commit d96ad7fa1d
No known key found for this signature in database
GPG key ID: E315A75846131564

View file

@ -558,42 +558,50 @@ these types and other mathematical functions.")
(define-public ntl (define-public ntl
(package (package
(name "ntl") (name "ntl")
(version "9.7.0") (version "11.4.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://shoup.net/ntl/ntl-" (uri (string-append "https://shoup.net/ntl/ntl-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (base32 (sha256
"115frp5flyvw9wghz4zph1b3llmr5nbxk1skgsggckr81fh3gmxq")))) (base32
"1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "src/libtool-origin")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("libtool" ,libtool) `(("libtool" ,libtool)
("perl" ,perl))) ; for configuration ("perl" ,perl))) ; for configuration
;; FIXME: Add optional input gf2x once available; then also add
;; configure flag "NTL_GF2X_LIB=on".
(inputs (inputs
`(("gmp" ,gmp))) `(("gmp" ,gmp)
("gf2x" ,gf2x)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(chdir "src") (chdir "src")
(system* "./configure" (invoke "./configure"
(string-append "PREFIX=" (assoc-ref outputs "out")) (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. ;; Do not build especially for the build machine.
"NATIVE=off" "NATIVE=off"
;; Also do not tune to the build machine. "NTL_GF2X_LIB=on"
"WIZARD=off" "SHARED=on"))))))
"SHARED=on")
#t)))))
(synopsis "C++ library for number theory") (synopsis "C++ library for number theory")
(description (description
"NTL is a C++ library providing data structures and algorithms "NTL is a C++ library providing data structures and algorithms
for manipulating signed, arbitrary length integers, and for vectors, for manipulating signed, arbitrary length integers, and for vectors,
matrices, and polynomials over the integers and over finite fields.") matrices, and polynomials over the integers and over finite fields.")
(license license:gpl2+) (license license:gpl2+)
(home-page "http://shoup.net/ntl/"))) (home-page "https://shoup.net/ntl/")))
(define-public singular (define-public singular
(package (package
@ -1451,8 +1459,7 @@ of M4RI from F_2 to F_{2^e}.")
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool))) ("libtool" ,libtool)))
(inputs (inputs
`(("gmp" ,gmp) `(("ntl" ,ntl)
("ntl" ,ntl)
("pari-gp" ,pari-gp))) ("pari-gp" ,pari-gp)))
(synopsis "Ranks of elliptic curves and modular symbols") (synopsis "Ranks of elliptic curves and modular symbols")
(description "The eclib package includes mwrank (for 2-descent on (description "The eclib package includes mwrank (for 2-descent on