diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-03-15 11:40:45 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-03-15 11:41:16 +0200 |
| commit | 9562d50d8eb787c33c0ab0606ea59aed7696f4ef (patch) | |
| tree | bdae19cc5b6782a74efedb47150637b3e4c0ea4f /gnu/packages/libffi.scm | |
| parent | 0ca7e1909356967429309ecdf70a21f609413521 (diff) | |
| download | guix-patches-9562d50d8eb787c33c0ab0606ea59aed7696f4ef.tar guix-patches-9562d50d8eb787c33c0ab0606ea59aed7696f4ef.tar.gz | |
gnu: libffi: Inline all patches.
* gnu/packages/libffi.scm (libffi)[source]: Add patch.
[arguments]: Remove custom patch phases.
[inputs]: Remove field.
Diffstat (limited to 'gnu/packages/libffi.scm')
| -rw-r--r-- | gnu/packages/libffi.scm | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 0f549bdbda..72263696f9 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -2,7 +2,7 @@ ;;; 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, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2020, 2021 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> @@ -52,45 +52,14 @@ (sha256 (base32 "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj")) - (patches (search-patches "libffi-3.3-powerpc-fixes.patch")))) + (patches (search-patches "libffi-3.3-powerpc-fixes.patch" + "libffi-float128-powerpc64le.patch")))) (build-system gnu-build-system) (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") - - ;; TODO: Inline patches 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" "--force" "-p1" - "-i" patch)))))) - '()) - ,@(if (string-prefix? "powerpc64le-" (or (%current-target-system) - (%current-system))) - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'apply-patch2 - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs - "powerpc64le-patch"))) - (invoke "patch" "--force" "-p1" - "-i" patch)))))) - '()))) - (inputs - (cond - ((string-prefix? "powerpc-" (or (%current-target-system) - (%current-system))) - `(("powerpc-patch" ,@(search-patches - "libffi-3.3-powerpc-fixes.patch")))) - ((string-prefix? "powerpc64le-" (or (%current-target-system) - (%current-system))) - `(("powerpc64le-patch" ,@(search-patches - "libffi-float128-powerpc64le.patch")))) - (else '()))) + #:configure-flags '("--enable-portable-binary" + "--without-gcc-arch"))) (outputs '("out" "debug")) (synopsis "Foreign function call interface library") (description |