05/18: gnu: icu4c: Make 'libicudata.so' behave the same on all architectures.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit f73fe13ccd1ef3fe6f6e0409fa817e5feb612e40
Author: Marius Bakke <address@hidden>
Date:   Tue Jul 23 19:11:33 2019 +0200

    gnu: icu4c: Make 'libicudata.so' behave the same on all architectures.
    
    * gnu/packages/icu4c.scm (icu4c)[arguments]: Do not pass
    '--with-data-packaging=archive' in #:configure-flags.  Add phase to enable 
use
    of standard libraries in libicudata.so.
---
 gnu/packages/icu4c.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 2587219..922dfbd 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -76,17 +76,19 @@
     `(("perl" ,perl)))
    (arguments
     `(#:configure-flags
-      '("--enable-rpath"
-        ,@(if (let ((s (or (%current-target-system)
-                           (%current-system))))
-                (or (string-prefix? "arm" s)
-                    (string-prefix? "mips" s)))
-              '("--with-data-packaging=archive")
-              '()))
+      '("--enable-rpath")
       #:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'chdir-to-source
           (lambda _ (chdir "source") #t))
+        (add-after 'chdir-to-source 'update-LDFLAGS
+          (lambda _
+            ;; Do not create a "data-only" libicudata.so because it causes
+            ;; problems on some architectures (notably armhf and MIPS).
+            (substitute* "config/mh-linux"
+              (("LDFLAGSICUDT=-nodefaultlibs -nostdlib")
+               "LDFLAGSICUDT="))
+            #t))
         (add-after 'install 'avoid-coreutils-reference
           ;; Don't keep a reference to the build tools.
           (lambda* (#:key outputs #:allow-other-keys)