guix-commits
[Top][All Lists]
Advanced

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

09/09: gnu: js8call: Remove workaround.


From: guix-commits
Subject: 09/09: gnu: js8call: Remove workaround.
Date: Fri, 17 Dec 2021 09:21:12 -0500 (EST)

glv pushed a commit to branch master
in repository guix.

commit 6718fe7e872e78f8f15dd596fcf15c594a039bfe
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Fri Dec 17 15:17:06 2021 +0100

    gnu: js8call: Remove workaround.
    
    * gnu/packages/radio.scm (js8call)[arguments]: Remove
      'work-around-runtime-bug' phase.
---
 gnu/packages/radio.scm | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 0aa06eb..cdef088 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1224,19 +1224,7 @@ weak-signal conditions.")
                (("DESTINATION /usr/share")
                 (string-append "DESTINATION "
                                (assoc-ref outputs "out")
-                               "/share")))
-             #t))
-         (add-after 'fix-paths 'work-around-runtime-bug
-           (lambda _
-             ;; Some of the programs in this package fail to find symbols
-             ;; in libm at runtime. Adding libm manually at the end of the
-             ;; library lists when linking the programs seems to help.
-             ;; TODO: find exactly what is wrong in the way the programs
-             ;; are built.
-             (substitute* "CMakeLists.txt"
-               (("target_link_libraries \\((.*)\\)" all libs)
-                (string-append "target_link_libraries (" libs " m)")))
-             #t))
+                               "/share")))))
          (add-after 'unpack 'fix-hamlib
            (lambda _
              (substitute* "CMake/Modules/Findhamlib.cmake"
@@ -1246,8 +1234,7 @@ weak-signal conditions.")
   set (ENV{PKG_CONFIG_PATH} \"${__pc_path}\")"))
              (substitute* "HamlibTransceiver.hpp"
                (("#ifdef JS8_USE_LEGACY_HAMLIB")
-                "#if 1"))
-             #t)))))
+                "#if 1")))))))
     (synopsis "Weak-signal ham radio communication program")
     (description
      "JS8Call is a software using the JS8 digital mode (a derivative of the FT8



reply via email to

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