guix-commits
[Top][All Lists]
Advanced

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

branch master updated: gnu: qt-creator: Fix patch-perfparser phase.


From: guix-commits
Subject: branch master updated: gnu: qt-creator: Fix patch-perfparser phase.
Date: Tue, 02 Apr 2024 23:55:27 -0400

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new f26b42f6c0 gnu: qt-creator: Fix patch-perfparser phase.
f26b42f6c0 is described below

commit f26b42f6c07a00dd2cecb006846e672b88748b84
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Apr 2 23:51:05 2024 -0400

    gnu: qt-creator: Fix patch-perfparser phase.
    
    This is a follow-up to f83bdd7e00 ("gnu: qt-creator: Patch file names of
    demangling libraries.")
    
    * gnu/packages/qt.scm (qt-creator)
    [phases] <patch-perfparser>: Adjust demangler.cpp file name.
    
    Change-Id: I72c517636bf866b57daa5d56dd8db643b0669a88
---
 gnu/packages/qt.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c9a10c7441..2f052f7b42 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5226,7 +5226,8 @@ including @i{fix-its} for automatic refactoring.")
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-perfparser
             ;; XXX: The 'patch-perfparser' phase is also used by the 'hotspot'
-            ;; package; keep its copy in sync.
+            ;; package; keep its copy in sync (paying attention to the
+            ;; different demangler.cpp file name).
             (lambda* (#:key inputs #:allow-other-keys)
               ;; perfparser attempts to dynamically load the demangle
               ;; libraries; use their absolute file name to avoid having to
@@ -5239,7 +5240,7 @@ including @i{fix-its} for automatic refactoring.")
                        (lambda ()
                          (search-input-file inputs "lib/librustc_demangle.so"))
                        #:unwind? #t)))
-                (substitute* "3rdparty/perfparser/app/demangler.cpp"
+                (substitute* "src/tools/perfparser/app/demangler.cpp"
                   (("loadDemangleLib\\(QStringLiteral\\(\"rustc_demangle\")"
                     all)
                    (if librustc_demangle.so



reply via email to

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