guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Revert "gnu: groff: Disable relocatability."


From: guix-commits
Subject: 01/01: Revert "gnu: groff: Disable relocatability."
Date: Wed, 16 Jan 2019 11:33:58 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 96733e941754759d4a1f45ef8fb05dc9ff6db7b3
Author: Efraim Flashner <address@hidden>
Date:   Wed Jan 16 18:27:27 2019 +0200

    Revert "gnu: groff: Disable relocatability."
    
    This causes more than 3600 packages to be rebuilt.
    
    This reverts commit f57693e17c7905d2f11e46d04cb558fe0b0fc39b.
---
 gnu/packages/groff.scm | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm
index 62e844e..77728a5 100644
--- a/gnu/packages/groff.scm
+++ b/gnu/packages/groff.scm
@@ -62,34 +62,6 @@
     `(#:parallel-build? #f   ; parallel build fails
       #: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* "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 'unpack 'setenv
           (lambda _
             (setenv "GS_GENERATE_UUIDS" "0")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]