ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ustr: Cross-compile.

Browse source 
Also fix <http://issues.guix.gnu.org/48084>.

* gnu/packages/text-utils.scm (ustr)[arguments]: Use CC-FOR-TARGET.
Add a new 'fix-cross-compilation phase.
This commit is contained in:
Tobias Geerinckx-Rice 2021-04-28 20:33:44 +02:00
parent f3b2d6681c
commit 1059d1570b
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/textutils.scm
View file

@ -315,7 +315,7 @@ (define-public ustr
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
(list "CC=gcc" (list (string-append "CC=" ,(cc-for-target))
"HIDE=" "HIDE="
;; Override "/sbin/ldconfig" with "echo" because we don't need ;; Override "/sbin/ldconfig" with "echo" because we don't need
;; "ldconfig". ;; "ldconfig".
@ -324,6 +324,18 @@ (define-public ustr
"all-shared") "all-shared")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-cross-compilation
;; The Makefile contains more insults than cross-compilation support.
;; It poorly reinvents autotools by compiling C programmes with $CC,
;; then tries to run them during the build. Hard-code the results.
(lambda _
(substitute* "Makefile"
(("\\./autoconf_64b")
,(if (target-64bit? (or (%current-target-system)
(%current-system)))
"echo 1"
"echo 0"))
(("\\./autoconf_vsnprintf") "echo 1"))))
(add-after 'unpack 'disable-check-for-stdint (add-after 'unpack 'disable-check-for-stdint
(lambda _ (lambda _
;; Of course we have stdint.h, just not in /usr/include ;; Of course we have stdint.h, just not in /usr/include