Fix build under clang-11

This commit is contained in:
Diane Bruce 2020-09-03 23:54:20 +00:00
parent 81750cabf0
commit 96c7941402
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=547490
2 changed files with 16 additions and 2 deletions

View File

@ -2,7 +2,7 @@
PORTNAME= wsjtx
DISTVERSION= 2.1.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= comms hamradio
MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
@ -30,6 +30,8 @@ USE_QT= core gui network widgets \
CMAKE_ARGS+= -DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \
-DLOCALBASE::STRING="${LOCALBASE}"
# for detailed debugging uncomment the next line
#CMAKE_ARGS+= --debug-output --trace
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
_PATCHES= wsjtx.patch hamlib.patch
@ -44,7 +46,7 @@ post-patch:
post-build:
# With cmake 3.18, the patching stage in the internal build
# is ran again, trick it by removing the patch again.
# is run again, trick it by removing the patch again.
. for _patch in ${_PATCHES}
${MV} ${WRKSRC}/${_patch}.orig ${WRKSRC}/${_patch}
. endfor

View File

@ -74,3 +74,15 @@
// Register some useful Qt types with QMetaType
Q_DECLARE_METATYPE (QHostAddress);
--- wsjtx/lib/wsprd/jelinek.h.orig 2020-08-23 10:47:23.539369000 -0400
+++ wsjtx/lib/wsprd/jelinek.h 2020-08-23 10:40:31.539503000 -0400
@@ -10,7 +10,7 @@
unsigned int jpointer;
};
-struct snode *stack;
+static struct snode *stack;
int jelinek(unsigned int *metric,
unsigned int *cycles,