pkgsrc-WIP-changes archive

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

(ham/wsjtx) fix cannot find -lwsjt_fort_omp



Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By:	mef
Date:		Sun Oct 12 14:24:02 2025 +0900
Changeset:	d993a3765c4d0ae04b1ec000d6c7438dfb3b4cd9

Modified Files:
	wsjtx/distinfo
	wsjtx/patches/patch-CMakeLists.txt

Log Message:
(ham/wsjtx) fix cannot find -lwsjt_fort_omp

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d993a3765c4d0ae04b1ec000d6c7438dfb3b4cd9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wsjtx/distinfo                     |  2 +-
 wsjtx/patches/patch-CMakeLists.txt | 28 ++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diffs:
diff --git a/wsjtx/distinfo b/wsjtx/distinfo
index c3974d2aa2..179df666e1 100644
--- a/wsjtx/distinfo
+++ b/wsjtx/distinfo
@@ -3,7 +3,7 @@ $NetBSD$
 BLAKE2s (wsjtx-2.5.4.tgz) = 67169293348ef4176ec9a709cde87488df716fd92af0a701b46f76f0216691db
 SHA512 (wsjtx-2.5.4.tgz) = c4092d03af3346f0244d942c3db693f5d2c1ed7a2ec9077ded039b7d162e15abdaf09dcb9997d1833d25c366eb03a0dab6114313d423e7e2c9ff37d965261efc
 Size (wsjtx-2.5.4.tgz) = 25369854 bytes
-SHA1 (patch-CMakeLists.txt) = 4dce1f9b33417d99c0cde04019c659c56dd2e13e
+SHA1 (patch-CMakeLists.txt) = 1fde6962614d53746285c65f036c0d78d886072b
 SHA1 (patch-CMake_Modules_FindUsb.cmake) = 6c9edbce838731a026d682ddd0a1174bbceb4e89
 SHA1 (patch-Radio.cpp) = a798fbf75deb3cd49c6a15cd1e74530bb955ee23
 SHA1 (patch-hamlib.patch) = 8d5cec646b0fe317a41da3ed66a299ea1510c87f
diff --git a/wsjtx/patches/patch-CMakeLists.txt b/wsjtx/patches/patch-CMakeLists.txt
index ab02917c08..ad13b37366 100644
--- a/wsjtx/patches/patch-CMakeLists.txt
+++ b/wsjtx/patches/patch-CMakeLists.txt
@@ -1,10 +1,17 @@
 $NetBSD$
 
+1.
 From FreeBSD ports 2.5.4
 
---- wsjtx/CMakeLists.txt.orig	2021-11-03 19:53:01.000000000 -0400
-+++ CMakeLists.txt	2021-12-31 07:53:05.900792000 -0500
-@@ -867,7 +867,7 @@
+2.
+To fix 
+/usr/bin/ld: cannot find -lwsjt_fort_omp: No such file or directory
+(info from)
+https://www.repo.radio/w4kek/WSJT-X/commit/2e3cec2201c33e16c2057958d0eb65ac0f2144a9?style=split&whitespace=show-all&show-outdated=
+
+--- CMakeLists.txt.orig	2021-12-28 18:31:58.000000000 +0900
++++ CMakeLists.txt	2025-10-12 14:16:36.191438094 +0900
+@@ -868,7 +868,7 @@
  # OpenMP
  #
  find_package (OpenMP)
@@ -13,7 +20,7 @@ From FreeBSD ports 2.5.4
  #
  # fftw3 single precision library
  #
-@@ -884,7 +884,7 @@
+@@ -885,7 +885,7 @@
  check_type_size (CACHE_ALL HAMLIB_OLD_CACHING)
  check_symbol_exists (rig_set_cache_timeout_ms "hamlib/rig.h" HAVE_HAMLIB_CACHING)
  
@@ -22,7 +29,7 @@ From FreeBSD ports 2.5.4
  
  #
  # Qt5 setup
-@@ -914,7 +914,7 @@
+@@ -915,7 +915,7 @@
  #
  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
  
@@ -31,7 +38,7 @@ From FreeBSD ports 2.5.4
  
  if (NOT APPLE)
    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas")
-@@ -1160,7 +1160,7 @@
+@@ -1161,7 +1161,7 @@
  target_link_libraries (encode77 wsjt_fort wsjt_cxx)
  
  add_executable (wsprsim ${wsprsim_CSRCS})
@@ -40,3 +47,12 @@ From FreeBSD ports 2.5.4
  
  add_executable (jt4code lib/jt4code.f90)
  target_link_libraries (jt4code wsjt_fort wsjt_cxx)
+@@ -1442,7 +1442,7 @@
+   )
+ 
+ target_include_directories (wsjtx PRIVATE ${FFTW3_INCLUDE_DIRS})
+-if (APPLE)
++if ((NOT ${OPENMP_FOUND}) OR APPLE)
+   target_link_libraries (wsjtx wsjt_fort)
+ else ()
+   target_link_libraries (wsjtx wsjt_fort_omp)


Home | Main Index | Thread Index | Old Index