Date: Sun, 9 Feb 2025 03:48:50 GMT From: Stephen Hurd <shurd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cbc58c695e80 - main - comms/wsjtz: Give bin/jt9 an executable stack Message-ID: <202502090348.5193moih075781@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbc58c695e8029da1779cb4bc05c70986af1c22d commit cbc58c695e8029da1779cb4bc05c70986af1c22d Author: Stephen Hurd <shurd@FreeBSD.org> AuthorDate: 2024-12-27 22:31:50 +0000 Commit: Stephen Hurd <shurd@FreeBSD.org> CommitDate: 2025-02-09 03:47:37 +0000 comms/wsjtz: Give bin/jt9 an executable stack jt9 is supposed to have an executable stack, but a bug in lld (now fixed upstream) prevents that. This change explicitly sets the required exectuable stack for jt9. Much simpler than using mprotect et. al. PR: 283670 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48573 --- comms/wsjtz/files/patch-CMakeLists.txt | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/comms/wsjtz/files/patch-CMakeLists.txt b/comms/wsjtz/files/patch-CMakeLists.txt index f174fe7d41ed..012db69b5b5a 100644 --- a/comms/wsjtz/files/patch-CMakeLists.txt +++ b/comms/wsjtz/files/patch-CMakeLists.txt @@ -35,7 +35,7 @@ # # fftw3 single precision library # -@@ -923,7 +941,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") +@@ -923,7 +941,7 @@ set (CMAKE_VISIBILITY_INLINES_HIDDEN ON) # set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") @@ -44,7 +44,7 @@ if (NOT APPLE) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas") -@@ -1169,7 +1187,7 @@ add_executable (wsprsim ${wsprsim_CSRCS}) +@@ -1169,7 +1187,7 @@ add_executable (encode77 lib/77bit/encode77.f90) target_link_libraries (encode77 wsjt_fort wsjt_cxx) add_executable (wsprsim ${wsprsim_CSRCS}) @@ -53,7 +53,7 @@ add_executable (jt4code lib/jt4code.f90) target_link_libraries (jt4code wsjt_fort wsjt_cxx) -@@ -1211,6 +1229,12 @@ endif(WSJT_BUILD_UTILS) +@@ -1211,6 +1229,12 @@ target_link_libraries (ldpcsim240_74 wsjt_fort wsjt_cx endif(WSJT_BUILD_UTILS) @@ -66,7 +66,19 @@ add_executable (fmtave lib/fmtave.f90) add_executable (fcal lib/fcal.f90) -@@ -1601,12 +1625,12 @@ install (PROGRAMS +@@ -1410,6 +1434,11 @@ if (${OPENMP_FOUND} OR APPLE) + else (${OPENMP_FOUND} OR APPLE) + target_link_libraries (jt9 wsjt_fort wsjt_cxx fort_qt) + endif (${OPENMP_FOUND} OR APPLE) ++if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ set_target_properties (jt9 PROPERTIES ++ LINK_FLAGS -Wl,-zexecstack ++ ) ++endif () + + if (WIN32) + # build map65 +@@ -1601,12 +1630,12 @@ install (PROGRAMS RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX} )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502090348.5193moih075781>