[PATCH core-updates] gnu: libjpeg-turbo: Fix building on powerpc.

DoneSubmitted by Efraim Flashner.
Details
2 participants
  • Efraim Flashner
  • Marius Bakke
Owner
unassigned
Severity
normal
E
E
Efraim Flashner wrote on 27 Apr 2020 12:36
(address . guix-patches@gnu.org)(name . Efraim Flashner)(address . efraim@flashner.co.il)
20200427103618.5696-1-efraim@flashner.co.il
* 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(-)

Toggle diff (36 lines)
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
M
M
Marius Bakke wrote on 28 Apr 2020 15:54
(name . Efraim Flashner)(address . efraim@flashner.co.il)
87k11z7m1q.fsf@devup.no
Efraim Flashner <efraim@flashner.co.il> writes:

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

LGTM.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6oNaIACgkQoqBt8qM6
VPq1Fwf9EqClzwR+DcLdUSwazESntMYnNQAD8Ablf62GHx9t8BRQ07xrA3iBLZoZ
N9Loz5ein2cvu0i94HXtEbYhbIBqwNBKLNsrASaShIi73QIOFK1zgvCe4uf8Rr1V
6zC9gpJfwLd+cN8QBJiT5hx+ANrp2oFbkZh+4BJm3dizxwz32YvSniLBuxChUdvJ
djivrr9KPdJwEVhAhuab7dJkbSr/kEcs/oC+vYlttN/rOTpq98bQ3r3h/Ii1MJu+
CzjsbGuFHvVu43grXJqMmM+tm8eoX0Btjk7G1gB/hQDLdO9lH0UJbxnMIihbI5kE
FXLZLORTaQp3RXuCAfxKtbO3g/FB7g==
=b/O1
-----END PGP SIGNATURE-----

E
E
Efraim Flashner wrote on 28 Apr 2020 16:02
(name . Marius Bakke)(address . mbakke@fastmail.com)(address . 40898-done@debbugs.gnu.org)
20200428140228.GU5243@E5400
On Tue, Apr 28, 2020 at 03:54:41PM +0200, Marius Bakke wrote:
Toggle quote (7 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl6oN3QACgkQQarn3Mo9
g1FaQA/+IHm/G3KKPb1beLvzHFbUh8KQg2hfhjhzqvFaYbgPfSjFtuPnMp4Gmsql
xBRXK7Bwo7KwM2EG1tCAlr0oelIjuAN81PmGTotIneRtj67Nk89OB0ea41arv9IF
NISZP2PmgCQYeiUwkfUkuDi0RKmXoPtTsJBKugKMyz1z76YEV+JFmnAIBqw4W0Vf
21CXzyMHGXSj5AGpVa7avT9xpNET/JNjc6Usbbnjn9qL0QQSYTAXcIhkTmuTqWie
45xYbblUYcpMOsJL+YuMGuvJHleTETxyIsNKRasZVVbCIRlMU6VpYQWS3mKbKn9h
jovPADbNzBpeakkPRoF3vsPTbFl+TBRfqw1bCVmqs6naTi0QXjqHw3KXVV7o3x+P
sXBdZFSLSlI16W8PUuQsah5Ov8Kre1yXbFVIXpZOE8HWGz4K+HxkLIlCK+77gDBP
IHYDXjvb5vnbNM6USZJW2vuaLOZbvGVa25kMm1fxIq2j++fVQ+urG206WrU9JZXV
oM+SdA7F6BfhT+Nzch5fqNIQagOPNs+mqRnblMI15OwvLBK8/IwBy1TM+1v0/CsH
KHNUgQ9tDruHVfblBMnMjEh+/jZ09kjDMlifCFajghn03Yz6qJyiM2E4yF+IPQBK
J5eaBUHJCIX3t8MqHNxBmiUY6OC1CEu5icoyoC+APXmELfUDZgk=
=wxnh
-----END PGP SIGNATURE-----


Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 40898@debbugs.gnu.org