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

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.
This commit is contained in:
Marius Bakke 2019-07-23 19:11:33 +02:00
parent 7999d317bc
commit f73fe13ccd
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/icu4c.scm
View File

@ -76,17 +76,19 @@
`(("perl" ,perl))) `(("perl" ,perl)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'("--enable-rpath" '("--enable-rpath")
,@(if (let ((s (or (%current-target-system)
(%current-system))))
(or (string-prefix? "arm" s)
(string-prefix? "mips" s)))
'("--with-data-packaging=archive")
'()))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'chdir-to-source (add-after 'unpack 'chdir-to-source
(lambda _ (chdir "source") #t)) (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 (add-after 'install 'avoid-coreutils-reference
;; Don't keep a reference to the build tools. ;; Don't keep a reference to the build tools.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)