guix-commits
[Top][All Lists]
Advanced

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

35/35: gnu: moarvm: Fix building on powerpc-linux.


From: guix-commits
Subject: 35/35: gnu: moarvm: Fix building on powerpc-linux.
Date: Mon, 4 Mar 2024 04:53:43 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 8850782392d4e58384d4c4da36a4f0bd5c8abdb1
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Mar 4 10:41:01 2024 +0200

    gnu: moarvm: Fix building on powerpc-linux.
    
    * gnu/packages/perl6.scm (moarvm)[arguments]: Adjust custom 'configure
    phase to add '-latomic' to the LDFLAGS when building for powerpc-linux.
    
    Change-Id: Ib8a25dea492c7e41c0f61440cc51d20adf77c183
---
 gnu/packages/perl6.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm
index 4f0fc1a5a7..10eb33be25 100644
--- a/gnu/packages/perl6.scm
+++ b/gnu/packages/perl6.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
 ;;;
@@ -23,6 +23,7 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix packages)
+  #:use-module (guix utils)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system rakudo)
   #:use-module (gnu packages bdw-gc)
@@ -56,7 +57,7 @@
            (delete-file-recursively "3rdparty/msinttypes")))))
     (build-system perl-build-system)
     (arguments
-     '(#:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-build
            (lambda _
@@ -67,7 +68,10 @@
              (let ((out (assoc-ref outputs "out"))
                    (pkg-config (assoc-ref inputs "pkg-config")))
                (setenv "CFLAGS" "-fcommon")
-               (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))
+               (setenv "LDFLAGS"
+                       ,@(if (target-ppc32?)
+                           `((string-append "-Wl,-rpath=" out "/lib" " 
-latomic"))
+                           `((string-append "-Wl,-rpath=" out "/lib"))))
                (invoke "perl" "Configure.pl"
                        "--prefix" out
                        "--pkgconfig" (string-append pkg-config 
"/bin/pkg-config")



reply via email to

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