ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 21:59:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libtommath: Update to 1.2.0.

Browse source 
* gnu/packages/multiprecision.scm (libtommath): Update to 1.2.0.
[arguments]: Update custom 'prepare-build for new version. Update custom
'check phase to use test-target keyword.
(libtommath@1.1): New variable.
(libtommath@1.0)[inherit]: Inherit from libtommath@1.1.
This commit is contained in:
Efraim Flashner 2019-10-22 15:48:48 +03:00
parent 6fc9c6f7d9
commit 0201e34cef
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gnu/packages/multiprecision.scm
View file

@ -293,7 +293,7 @@ (define-public tomsfastmath
(define-public libtommath (define-public libtommath
(package (package
(name "libtommath") (name "libtommath")
(version "1.1.0") (version "1.2.0")
(outputs '("out" "static")) (outputs '("out" "static"))
(source (source
(origin (origin
@ -302,8 +302,7 @@ (define-public libtommath
"download/v" version "/ltm-" version ".tar.xz")) "download/v" version "/ltm-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1bbyagqzfdbg37k1n08nsqzdf44z8zsnjjinqbsyj7rxg246qilh")) "1c8q1qy88cjhdjlk3g24mra94h34c1ldvkjz0n2988c0yvn5xixp"))))
(patches (search-patches "libtommath-fix-linkage.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -311,10 +310,6 @@ (define-public libtommath
(delete 'configure) ; no configure (delete 'configure) ; no configure
(add-after 'unpack 'prepare-build (add-after 'unpack 'prepare-build
(lambda _ (lambda _
;; Don't pull in coreutils.
(substitute* "makefile_include.mk"
(("arch") "uname -m"))
;; We want the shared library by default so force it to be the ;; We want the shared library by default so force it to be the
;; default makefile target. ;; default makefile target.
(delete-file "makefile") (delete-file "makefile")
@ -326,14 +321,15 @@ (define-public libtommath
"/lib/libtommath.a")) "/lib/libtommath.a"))
#t)) #t))
(replace 'check (replace 'check
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key test-target make-flags #:allow-other-keys)
(apply invoke "make" "test_standalone" make-flags) (apply invoke "make" test-target make-flags)
(invoke "sh" "test"))) (invoke "sh" "test")))
(add-after 'install 'install-static-library (add-after 'install 'install-static-library
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "-f" "makefile.unix" "install" (invoke "make" "-f" "makefile.unix" "install"
(string-append "PREFIX=" (assoc-ref outputs "static")) (string-append "PREFIX=" (assoc-ref outputs "static"))
(string-append "CC=" (which "gcc")))))) (string-append "CC=" (which "gcc"))))))
#:test-target "test"
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc"))) "CC=gcc")))
(native-inputs (native-inputs
@ -346,9 +342,34 @@ (define-public libtommath
the box without configuration.") the box without configuration.")
(license unlicense))) (license unlicense)))
(define-public libtommath-1.0 (define-public libtommath-1.1
(package (package
(inherit libtommath) (inherit libtommath)
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/libtom/libtommath/releases/"
"download/v" version "/ltm-" version ".tar.xz"))
(sha256
(base32
"1bbyagqzfdbg37k1n08nsqzdf44z8zsnjjinqbsyj7rxg246qilh"))
(patches (search-patches "libtommath-fix-linkage.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments libtommath)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'patch-coreutils-call
(lambda _
;; Don't pull in coreutils.
(substitute* "makefile_include.mk"
(("arch") "uname -m"))
#t))))
((#:test-target _) "test_standalone")))))
(define-public libtommath-1.0
(package
(inherit libtommath-1.1)
(version "1.0.1") (version "1.0.1")
(outputs '("out")) (outputs '("out"))
(source (source
@ -360,7 +381,7 @@ (define-public libtommath-1.0
(base32 (base32
"0sbccdwbkfc680id2fi0x067j23biqcjqilwkk7y9339knrjy0s7")))) "0sbccdwbkfc680id2fi0x067j23biqcjqilwkk7y9339knrjy0s7"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments libtommath) (substitute-keyword-arguments (package-arguments libtommath-1.1)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(delete 'install-static-library))))))) (delete 'install-static-library)))))))