nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gettext: Update to 0.20.1. 

* gnu/packages/gettext.scm (gettext-minimal): Update to 0.20.1.
[source](snippet): Remove.
[inputs]: Remove EXPAT.  Add LIBUNISTRING, LIBXML2, and NCURSES.
[arguments]: Add #:configure-flags and a "patch-fixed-paths" phase.  Delete
"link-expat" phase.
* gnu/packages/commencement.scm (gettext-boot0): Stay on version 0.19.8.1.
[arguments]: Adjust accordingly.

Co-authored-by: Miguel <rosen644835@gmail.com>
This commit is contained in:
Marius Bakke 2019-06-30 16:46:37 +02:00
parent f16a866f74
commit 3730e3c64e
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gnu/packages/commencement.scm
View File

@ -2015,30 +2015,33 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(let ((gettext-minimal (let ((gettext-minimal
(package (inherit gettext-minimal) (package (inherit gettext-minimal)
(name "gettext-boot0") (name "gettext-boot0")
;; Newer versions of GNU gettext depends on libxml2 and ncurses. To
;; simplify the dependency chain, we stick to this version here.
(version "0.19.8.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gettext/gettext-"
version ".tar.gz"))
(sha256
(base32
"0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z"))))
(inputs '()) ;zero dependencies (inputs '()) ;zero dependencies
(arguments (arguments
(substitute-keyword-arguments `(#:tests? #f
`(#:tests? #f #:phases (modify-phases %standard-phases
,@(package-arguments gettext-minimal)) ;; Build only the tools.
((#:phases phases) (add-after 'unpack 'chdir
`(modify-phases ,phases (lambda _
;; Build only the tools. (chdir "gettext-tools")
(add-after 'unpack 'chdir #t))
(lambda _
(chdir "gettext-tools")
#t))
;; Some test programs require pthreads, which we don't have. ;; Some test programs require pthreads, which we don't have.
(add-before 'configure 'no-test-programs (add-before 'configure 'no-test-programs
(lambda _ (lambda _
(substitute* "tests/Makefile.in" (substitute* "tests/Makefile.in"
(("^PROGRAMS =.*$") (("^PROGRAMS =.*$")
"PROGRAMS =\n")) "PROGRAMS =\n"))
#t)) #t))))))))
;; Don't try to link against libexpat.
(delete 'link-expat)
(delete 'patch-tests))))))))
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package-with-explicit-inputs gettext-minimal (package-with-explicit-inputs gettext-minimal
%boot1-inputs %boot1-inputs

67
gnu/packages/gettext.scm
View File

@ -4,10 +4,11 @@
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Miguel <rosen644835@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,6 +34,8 @@
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages emacs) #:use-module (gnu packages emacs)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages tex) #:use-module (gnu packages tex)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
@ -41,34 +44,42 @@
(define-public gettext-minimal (define-public gettext-minimal
(package (package
(name "gettext-minimal") (name "gettext-minimal")
(version "0.19.8.1") (version "0.20.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/gettext/gettext-" (uri (string-append "mirror://gnu/gettext/gettext-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z")) "0p3zwkk27wm2m2ccfqm57nj7vqkmfpn7ja1nf65zmhz8qqs5chb6"))))
(modules '((guix build utils)))
(snippet
'(begin
;; The gnulib test-lock test is prone to writer starvation
;; with our glibc@2.25, which prefers readers, so disable it.
;; The gnulib commit b20e8afb0b2 should fix this once
;; incorporated here.
(substitute* "gettext-runtime/tests/Makefile.in"
(("TESTS = test-lock\\$\\(EXEEXT\\)") "TESTS ="))
(substitute* "gettext-tools/gnulib-tests/Makefile.in"
(("test-lock\\$\\(EXEEXT\\) ") ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ;8 MiB of HTML "doc")) ;9 MiB of HTML
(inputs (inputs
`(("expat" ,expat))) `(("libunistring" ,libunistring)
("libxml2" ,libxml2)
;; TODO: ncurses is only needed for the 'libtextstyle' library.
;; The next version of gettext can use a separate libtextstyle,
;; but for now we include it here in 'gettext-minimal'.
("ncurses" ,ncurses)))
(arguments (arguments
`(#:phases `(#:configure-flags '("--with-included-libunistring=no"
"--with-included-libxml=no")
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'patch-source-shebangs 'patch-fixed-paths
(lambda _
(substitute* '("gettext-tools/config.h.in"
"gettext-tools/gnulib-tests/init.sh"
"gettext-tools/tests/init.sh"
"gettext-tools/system-tests/run-test")
(("/bin/sh") "sh"))
(substitute* '("gettext-tools/src/project-id"
"gettext-tools/projects/KDE/trigger"
"gettext-tools/projects/GNOME/trigger")
(("/bin/pwd") "pwd"))
#t))
(add-before 'check 'patch-tests (add-before 'check 'patch-tests
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((bash (which "sh"))) (let* ((bash (which "sh")))
@ -92,15 +103,7 @@
(("/bin/pwd") (("/bin/pwd")
"pwd")) "pwd"))
#t)))) #t)))))
(add-before 'configure 'link-expat
(lambda _
;; Gettext defaults to opening expat via dlopen on
;; "Linux". Change to link directly.
(substitute* "gettext-tools/configure"
(("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"")
(("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\""))
#t)))
;; When tests fail, we want to know the details. ;; When tests fail, we want to know the details.
#:make-flags '("VERBOSE=yes"))) #:make-flags '("VERBOSE=yes")))