me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Efraim Flashner 2020-04-27 09:45:54 +03:00
parent 587398d2a8
commit 2f823fb493
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/image.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2015 Amirouche Boubekki <amirouche@hypermove.net> ;;; Copyright © 2015 Amirouche Boubekki <amirouche@hypermove.net>
;;; Copyright © 2014, 2017 John Darrington <jmd@gnu.org> ;;; Copyright © 2014, 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2018, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net>
@ -1532,6 +1532,10 @@ is hereby granted."))))
(arguments (arguments
`(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib" `(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib"
"-DENABLE_STATIC=0" "-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 ;; The build system probes for the current CPU, but
;; that fails when cross-compiling. ;; that fails when cross-compiling.
,@(let ((target (%current-target-system))) ,@(let ((target (%current-target-system)))
@ -1545,6 +1549,9 @@ is hereby granted."))))
`("-DCMAKE_SYSTEM_PROCESSOR=x86")) `("-DCMAKE_SYSTEM_PROCESSOR=x86"))
((string-prefix? "x86_64" target) ((string-prefix? "x86_64" target)
`("-DCMAKE_SYSTEM_PROCESSOR=x86_64")) `("-DCMAKE_SYSTEM_PROCESSOR=x86_64"))
;; 32-bit and 64-bit
((string-prefix? "powerpc" target)
`("-DCMAKE_SYSTEM_PROCESSOR=powerpc"))
(else '())) (else '()))
'()))) '())))
,@(if (%current-target-system) ,@(if (%current-target-system)