guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: guile-3.0-latest: Fix build on powerpc-linux.


From: guix-commits
Subject: 01/02: gnu: guile-3.0-latest: Fix build on powerpc-linux.
Date: Tue, 1 Mar 2022 14:45:41 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit c835c508a77884e29c1f2e91065d1325584863c6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Mar 1 14:58:08 2022 +0200

    gnu: guile-3.0-latest: Fix build on powerpc-linux.
    
    * gnu/packages/guile.scm (guile-3.0-latest)[arguments]: On powerpc-linux
    replace the 'adjust-bootstrap-flags for changes in the source code.
---
 gnu/packages/guile.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 6f4afe92cc..328d4506c2 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -15,7 +15,7 @@
 ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2019 Taylan Kammer <taylan.kammer@gmail.com>
-;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 Timothy Sample <samplet@ngyro.com>
 ;;;
@@ -406,7 +406,19 @@ without requiring the source code to be rewritten.")
        ;; its multi-stage build process for cross-module inlining, except when
        ;; cross-compiling.
        ((#:parallel-build? _ #f)
-        (not (%current-target-system)))))))
+        (not (%current-target-system)))
+       ((#:phases phases)
+        `(modify-phases ,phases
+           ,@(if (target-ppc32?)
+               `((replace 'adjust-bootstrap-flags
+                   (lambda _
+                     ;; Upstream knows about suggested solution.
+                     ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45214
+                     ;; 
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=977223#46
+                     (substitute* "stage0/Makefile.in"
+                       (("^GUILE_OPTIMIZATIONS.*")
+                        "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives 
-Ocps\n")))))
+               '())))))))
 
 (define-public guile-3.0/fixed
   ;; A package of Guile that's rarely changed.  It is the one used in the



reply via email to

[Prev in Thread] Current Thread [Next in Thread]