all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#40898] [PATCH core-updates] gnu: libjpeg-turbo: Fix building on powerpc.
@ 2020-04-27 10:36 Efraim Flashner
  2020-04-28 13:54 ` Marius Bakke
  0 siblings, 1 reply; 3+ messages in thread
From: Efraim Flashner @ 2020-04-27 10:36 UTC (permalink / raw)
  To: 40898; +Cc: Efraim Flashner

* 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 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)
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#40898] [PATCH core-updates] gnu: libjpeg-turbo: Fix building on powerpc.
  2020-04-27 10:36 [bug#40898] [PATCH core-updates] gnu: libjpeg-turbo: Fix building on powerpc Efraim Flashner
@ 2020-04-28 13:54 ` Marius Bakke
  2020-04-28 14:02   ` bug#40898: " Efraim Flashner
  0 siblings, 1 reply; 3+ messages in thread
From: Marius Bakke @ 2020-04-28 13:54 UTC (permalink / raw)
  To: Efraim Flashner, 40898

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#40898: [PATCH core-updates] gnu: libjpeg-turbo: Fix building on powerpc.
  2020-04-28 13:54 ` Marius Bakke
@ 2020-04-28 14:02   ` Efraim Flashner
  0 siblings, 0 replies; 3+ messages in thread
From: Efraim Flashner @ 2020-04-28 14:02 UTC (permalink / raw)
  To: Marius Bakke; +Cc: 40898-done

[-- Attachment #1: Type: text/plain, Size: 560 bytes --]

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 :)


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-04-28 14:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-27 10:36 [bug#40898] [PATCH core-updates] gnu: libjpeg-turbo: Fix building on powerpc Efraim Flashner
2020-04-28 13:54 ` Marius Bakke
2020-04-28 14:02   ` bug#40898: " Efraim Flashner

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.