diff mbox series

[bug#40898,core-updates] gnu: libjpeg-turbo: Fix building on powerpc.

Message ID 20200427103618.5696-1-efraim@flashner.co.il
State Accepted
Headers show
Series [bug#40898,core-updates] gnu: libjpeg-turbo: Fix building on powerpc. | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job

Commit Message

Efraim Flashner April 27, 2020, 10:36 a.m. UTC 
* 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(-)

Comments

Marius Bakke April 28, 2020, 1:54 p.m. UTC | #1 
Efraim Flashner <efraim@flashner.co.il> writes:

> * gnu/packages/image.scm (libjpeg-turbo)[arguments]: Add configure-flags
> specific to powerpc to fix building and cross-building.

LGTM.
Efraim Flashner April 28, 2020, 2:02 p.m. UTC | #2 
On Tue, Apr 28, 2020 at 03:54:41PM +0200, Marius Bakke wrote:
> Efraim Flashner <efraim@flashner.co.il> writes:
> 
> > * gnu/packages/image.scm (libjpeg-turbo)[arguments]: Add configure-flags
> > specific to powerpc to fix building and cross-building.
> 
> LGTM.

Thanks. Patch pushed. I tested on native hardware and cross building :)
diff mbox series

Patch

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index c900bd0eb9..96e207e940 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -8,7 +8,7 @@ 
 ;;; Copyright © 2015 Amirouche Boubekki <amirouche@hypermove.net>
 ;;; Copyright © 2014, 2017 John Darrington <jmd@gnu.org>
 ;;; 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 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net>
@@ -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)