diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-14 00:32:53 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-14 00:32:53 +0200 |
| commit | 51deacd8604b59aa434e944c73aecefd5183d13e (patch) | |
| tree | 7429b8652ce656f883e8277ec95e273d88fe0fe3 /gnu/packages/apr.scm | |
| parent | 3349a50d700a2112a31ac4ce6cc6639d3b4cf1e2 (diff) | |
| parent | be6f5edd445850720dfcec2642db643b84fc0645 (diff) | |
| download | guix-51deacd8604b59aa434e944c73aecefd5183d13e.tar.gz guix-51deacd8604b59aa434e944c73aecefd5183d13e.zip | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/apr.scm')
| -rw-r--r-- | gnu/packages/apr.scm | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm index aedddd8644..aac3822eae 100644 --- a/gnu/packages/apr.scm +++ b/gnu/packages/apr.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,8 @@ #:use-module ((guix licenses) #:prefix l:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages perl) @@ -46,9 +49,23 @@ ;; Sometimes we end up with two processes concurrently trying to make ;; 'libmod_test.la': <http://hydra.gnu.org/build/60266/nixlog/2/raw>. ;; Thus, build sequentially. - '(#:parallel-build? #f - #:parallel-tests? #f)) + `(#:parallel-build? #f + #:parallel-tests? #f + ,@(if (target-ppc32?) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (invoke "patch" "-p1" "--force" "--input" + (assoc-ref (or native-inputs inputs) + "atomics-patch")))))) + '()))) (inputs (list perl libltdl)) + (native-inputs + `(,@(if (target-ppc32?) + `(("atomics-patch" + ,(local-file (search-patch "apr-fix-atomics.patch")))) + '()))) (home-page "https://apr.apache.org/") (synopsis "The Apache Portable Runtime Library") (description |