me
/
guix
Archived
1
0
Fork 0
Code

gnu: libjpeg-turbo: Fix cross-compilation. 

* gnu/packages/image.scm (libjpeg-turbo)[arguments]: In #:configure-flags, add
"-DCMAKE_SYSTEM_PROCESSOR" for known architectures when cross-compiling.
master
Marius Bakke 2020-01-26 12:57:56 +01:00
parent 28ba01aec6
commit f3418f58dc
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/image.scm
View File

@ -1507,7 +1507,22 @@ is hereby granted."))))
`(("nasm" ,nasm)))
(arguments
`(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib"
"-DENABLE_STATIC=0")
"-DENABLE_STATIC=0"
;; The build system probes for the current CPU, but
;; that fails when cross-compiling.
,@(let ((target (%current-target-system)))
(if target
(cond
((string-prefix? "arm" target)
`("-DCMAKE_SYSTEM_PROCESSOR=arm"))
((string-prefix? "aarch64" target)
`("-DCMAKE_SYSTEM_PROCESSOR=aarch64"))
((string-prefix? "i686" target)
`("-DCMAKE_SYSTEM_PROCESSOR=x86"))
((string-prefix? "x86_64" target)
`("-DCMAKE_SYSTEM_PROCESSOR=x86_64"))
(else '()))
'())))
,@(if (%current-target-system)
'()
;; Use a special "bootstrap" CMake for the native build to work