tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-27 03:21:49 +02:00
Code Activity

gnu: libffi: Fix building on powerpc.

Browse Source 
* gnu/packages/libffi.scm (libffi)[inputs]: New field.
[arguments]: Add 'apply-patch' phase when targeting PowerPC.
* gnu/packages/patches/libffi-3.3-powerpc-fixes.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Efraim Flashner
2020-03-26 15:06:23 +01:00
committed by Ludovic Courtès
parent 9909eddbc5
commit 02f5ee01c9
3 changed files with 160 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gnu/packages/libffi.scm
+21 -3
View File
@@ -1,8 +1,8 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013, 2014, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015, 2019 Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -55,7 +55,25 @@
(arguments
`(;; Prevent the build system from passing -march and -mtune to the
;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4".
#:configure-flags '("--enable-portable-binary" "--without-gcc-arch")))
#:configure-flags '("--enable-portable-binary" "--without-gcc-arch")
;; TODO: Inline patch on next rebuild cycle.
,@(if (string-prefix? "powerpc-" (or (%current-target-system)
(%current-system)))
'(#:phases (modify-phases %standard-phases
(add-after 'unpack 'apply-patch
(lambda* (#:key inputs #:allow-other-keys)
(let ((patch (assoc-ref inputs
"powerpc-patch")))
(invoke "patch" "--batch" "-p1"
"-i" patch))))))
'())))
(inputs
(if (string-prefix? "powerpc-" (or (%current-target-system)
(%current-system)))
`(("powerpc-patch" ,@(search-patches
"libffi-3.3-powerpc-fixes.patch")))
'()))
(outputs '("out" "debug"))
(synopsis "Foreign function call interface library")
(description