This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch core-updates
in repository guix.
The following commit(s) were added to refs/heads/core-updates by this push:
new 2f823fb gnu: libjpeg-turbo: Fix building on powerpc.
2f823fb is described below
commit 2f823fb493051df371f9637b782e6c46e13a8e10
Author: Efraim Flashner <[email protected]>
AuthorDate: Mon Apr 27 09:45:54 2020 +0300
gnu: libjpeg-turbo: Fix building on powerpc.
* gnu/packages/image.scm (libjpeg-turbo)[arguments]: Add configure-flags
specific to powerpc to fix building and cross-building.
---
gnu/packages/image.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index c900bd0..96e207e 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2015 Amirouche Boubekki <[email protected]>
;;; Copyright © 2014, 2017 John Darrington <[email protected]>
;;; Copyright © 2016, 2017, 2018, 2020 Leo Famulari <[email protected]>
-;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <[email protected]>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner
<[email protected]>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice
<[email protected]>
;;; Copyright © 2016 Eric Bavier <[email protected]>
;;; Copyright © 2016, 2017 Arun Isaac <[email protected]>
@@ -1532,6 +1532,10 @@ is hereby granted."))))
(arguments
`(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib"
"-DENABLE_STATIC=0"
+ ;; djpeg-shared-3x2-float-prog-cmp fails on 32-bit
PPC.
+ ,@(if (string=? "powerpc-linux" (%current-system))
+ `("-DFLOATTEST=NO")
+ '())
;; The build system probes for the current CPU, but
;; that fails when cross-compiling.
,@(let ((target (%current-target-system)))
@@ -1545,6 +1549,9 @@ is hereby granted."))))
`("-DCMAKE_SYSTEM_PROCESSOR=x86"))
((string-prefix? "x86_64" target)
`("-DCMAKE_SYSTEM_PROCESSOR=x86_64"))
+ ;; 32-bit and 64-bit
+ ((string-prefix? "powerpc" target)
+ `("-DCMAKE_SYSTEM_PROCESSOR=powerpc"))
(else '()))
'())))
,@(if (%current-target-system)
