ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: groff: Adjust relocatability snippet for 1.22.4.

Browse source 
This commit does three things.  It reverts 73b2ce87 ("gnu: groff-minimal:
Disable relocatability."), re-applies f57693e1 ("gnu: groff: Disable
relocatability."), and finally adjusts the substitution for changes since
0559a4c2 ("gnu: groff: Update to 1.22.4.").

* gnu/packages/groff.scm (groff-minimal)[arguments]: Move relocatibility
snippet ...
(groff)[arguments]: ... here.  Don't delete relocation.cpp and adjust file name.
This commit is contained in:
Marius Bakke 2019-02-25 23:37:31 +01:00
parent 9a6b8c9fa3
commit 5466e82a1e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
gnu/packages/groff.scm
View file

@ -63,6 +63,29 @@ (define-public groff
`(#:parallel-build? #f ; parallel build fails `(#:parallel-build? #f ; parallel build fails
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'disable-relocatability
(lambda _
;; Groff contains a Rube Goldberg-esque relocator for the file
;; "charset.alias". It tries to find the current executable
;; using realpath, a do-it-yourself search in $PATH and so on.
;; Furthermore, the routine that does the search is buggy
;; in that it doesn't handle error cases when they arise.
;; This causes preconv to segfault when trying to look up
;; the file "charset.alias" in the NULL location.
;; The "charset.alias" parser is a copy of gnulib's, and a
;; non-broken version of gnulib's "charset.alias" parser is
;; part of glibc's libcharset.
;; However, groff unconditionally uses their own
;; "charset.alias" parser, but then DOES NOT INSTALL the
;; file "charset.alias" when glibc is too new.
;; In Guix, our file "charset.alias" only contains an obscure
;; alias for ASCII and nothing else. So just disable relocation
;; and make the entire "charset.alias" lookup fail.
;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30785> for
;; details.
(substitute* "Makefile.in"
(("-DENABLE_RELOCATABLE=1") ""))
#t))
(add-after 'unpack 'setenv (add-after 'unpack 'setenv
(lambda _ (lambda _
(setenv "GS_GENERATE_UUIDS" "0") (setenv "GS_GENERATE_UUIDS" "0")
@ -101,36 +124,6 @@ (define-public groff-minimal
,@(substitute-keyword-arguments (package-arguments groff) ,@(substitute-keyword-arguments (package-arguments groff)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'disable-relocatability
(lambda _
;; Groff contains a Rube Goldberg-esque relocator for the
;; file "charset.alias".
;; It tries to find the current executable using realpath,
;; a do-it-yourself search in $PATH and so on.
;; Furthermore, the routine that does the search is buggy
;; in that it doesn't handle error cases when they arise.
;; This causes preconv to segfault when trying to look up
;; the file "charset.alias" in the NULL location.
;; The "charset.alias" parser is a copy of gnulib's, and a
;; non-broken version of gnulib's "charset.alias" parser
;; is part of glibc's libcharset.
;; However, groff unconditionally uses their own
;; "charset.alias" parser, but then DOES NOT INSTALL the
;; file "charset.alias" when glibc is too new.
;; In Guix, our file "charset.alias" only contains an
;; obscure alias for ASCII and nothing else.
;; So just disable relocation and make the entire
;; "charset.alias" lookup fail.
;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30785>
;; for details.
(substitute* "src/libs/libgroff/Makefile.sub"
(("-DENABLE_RELOCATABLE=1") ""))
;; That file contains a crash bug--so make sure that
;; its contents are not there.
(call-with-output-file "src/libs/libgroff/relocate.cpp"
(lambda (port)
#t))
#t))
(add-after 'install 'remove-non-essential-programs (add-after 'install 'remove-non-essential-programs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Keep only the programs that man-db needs at run time, ;; Keep only the programs that man-db needs at run time,