ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libxrender: Fix cross compiling to riscv64-linux.

Browse source 
* gnu/packages/xorg.scm (libxrender)[arguments]: When cross compiling to
riscv64-linux replace config.sub and config.guess with newer versions.
[native-inputs]: When cross compiling to riscv64-linux add config.
This commit is contained in:
Efraim Flashner 2022-03-07 22:36:08 +02:00
parent f80034c1ff
commit 58e3a917e3
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/xorg.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com> ;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com>
;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
@ -4754,13 +4754,29 @@ (define-public libxrender
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "--disable-static" ,@(malloc0-flags)))) (list "--disable-static" ,@(malloc0-flags))
,@(if (and (%current-target-system)
(target-riscv64?))
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'update-config
(lambda* (#:key native-inputs #:allow-other-keys)
(install-file
(search-input-file native-inputs "/bin/config.sub") ".")
(install-file
(search-input-file native-inputs "/bin/config.guess") ".")))))
'())))
(propagated-inputs (propagated-inputs
(list xorgproto)) (list xorgproto))
(inputs (inputs
(list libx11)) (list libx11))
(native-inputs (native-inputs
(list pkg-config)) (append
(if (and (%current-target-system)
(target-riscv64?))
(list config)
'())
(list pkg-config)))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
(synopsis "Xorg Render Extension library") (synopsis "Xorg Render Extension library")
(description "Library for the Render Extension to the X11 protocol.") (description "Library for the Render Extension to the X11 protocol.")