gnu: talloc: Update to 2.1.16.

* gnu/packages/samba.scm (talloc): Update to 2.1.16.
[native-inputs]: Add WHICH.
[inputs]: Change from PYTHON-2 to PYTHON.
(talloc/static)[arguments]: Adjust GCC command line.
This commit is contained in:
Marius Bakke 2019-03-02 15:07:10 +01:00
parent c335df433f
commit 966c56f8c6
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -33,6 +33,7 @@ (define-module (gnu packages samba)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages backup) #:use-module (gnu packages backup)
#:use-module (gnu packages base)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages cups) #:use-module (gnu packages cups)
@ -240,14 +241,14 @@ (define-public samba
(define-public talloc (define-public talloc
(package (package
(name "talloc") (name "talloc")
(version "2.1.14") (version "2.1.16")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.samba.org/ftp/talloc/talloc-" (uri (string-append "https://www.samba.org/ftp/talloc/talloc-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di")))) "1aajda08yf7njgvg6r21ccxlvkarb9bwvf4jqh8yn3871a1zcnqr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -260,8 +261,10 @@ (define-public talloc
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(invoke "./configure" (invoke "./configure"
(string-append "--prefix=" out)))))))) (string-append "--prefix=" out))))))))
(native-inputs
`(("which" ,which)))
(inputs (inputs
`(("python" ,python-2))) `(("python" ,python)))
(home-page "https://talloc.samba.org") (home-page "https://talloc.samba.org")
(synopsis "Hierarchical, reference counted memory pool system") (synopsis "Hierarchical, reference counted memory pool system")
(description (description
@ -288,7 +291,8 @@ (define-public talloc/static
(replace 'build (replace 'build
(lambda _ (lambda _
(invoke "gcc" "-c" "-Ibin/default" "-I" "lib/replace" (invoke "gcc" "-c" "-Ibin/default" "-I" "lib/replace"
"-I." "-Wall" "-g" "talloc.c") "-I." "-Wall" "-g" "-D__STDC_WANT_LIB_EXT1__=1"
"talloc.c")
(invoke "ar" "rc" "libtalloc.a" "talloc.o"))) (invoke "ar" "rc" "libtalloc.a" "talloc.o")))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)