guix-commits
[Top][All Lists]
Advanced

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

07/07: gnu: rapidjson: Fix powerpc64le-linux build.


From: guix-commits
Subject: 07/07: gnu: rapidjson: Fix powerpc64le-linux build.
Date: Sat, 29 Oct 2022 14:14:36 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 34e6c5d4280d67729bbd8cdae333ca5e0bd580f5
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Oct 23 02:00:00 2022 +0200

    gnu: rapidjson: Fix powerpc64le-linux build.
    
    …by avoiding ‘-march=native’, which is an unnecessary risk even if the
    result is not installed.
    
    * gnu/packages/web.scm (rapidjson)[arguments]: Replace the outdated
    'patch-aarch-march-detection phase with an unconditional
    'fix-march=native one.
---
 gnu/packages/web.scm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index abdd8cacdb..d30a2145df 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1381,15 +1381,12 @@ current version of any major web browser.")
                   (delete-file-recursively "bin/jsonchecker")))))
     (build-system cmake-build-system)
     (arguments
-     (if (string-prefix? "aarch64" (or (%current-target-system)
-                                       (%current-system)))
-         '(#:phases
-           (modify-phases %standard-phases
-             (add-after 'unpack 'patch-aarch-march-detection
-               (lambda _
-                 (substitute* (find-files "." "^CMakeLists\\.txt$")
-                   (("native") "armv8-a"))))))
-         '()))
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-march=native
+           (lambda _
+             (substitute* "CMakeLists.txt"
+               (("-m[^-]*=native") "")))))))
     (home-page "https://github.com/Tencent/rapidjson";)
     (synopsis "JSON parser/generator for C++ with both SAX/DOM style API")
     (description



reply via email to

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