Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Mar 2023 00:25:16 GMT
From:      Koichiro Iwao <meta@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 249b0b1cd170 - main - security/softether5: revert adding DEBUG option
Message-ID:  <202303070025.3270PGv5097144@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by meta:

URL: https://cgit.FreeBSD.org/ports/commit/?id=249b0b1cd170851928914fbc6fc6aeb41d822f7f

commit 249b0b1cd170851928914fbc6fc6aeb41d822f7f
Author:     Koichiro Iwao <meta@FreeBSD.org>
AuthorDate: 2023-03-07 00:17:36 +0000
Commit:     Koichiro Iwao <meta@FreeBSD.org>
CommitDate: 2023-03-07 00:23:40 +0000

    security/softether5: revert adding DEBUG option
    
    Add "WITH_DEBUG_PORTS+= security/softether5" to make.conf instead
    if want to enable debug build.
    
    Reported by:    danfe, mat
---
 security/softether5/Makefile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/security/softether5/Makefile b/security/softether5/Makefile
index fb8e5a63082b..117360db0d02 100644
--- a/security/softether5/Makefile
+++ b/security/softether5/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	softether
 DISTVERSION=	5.02.5180-292
 DISTVERSIONSUFFIX=	-g8c64dc0c
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	security net-vpn
 PKGNAMESUFFIX=	5
@@ -39,14 +39,15 @@ GH_TUPLE=	SoftEtherVPN:libhamcore:2951ae5:libhamcore/src/libhamcore \
 		BLAKE2:BLAKE2:b52178a:BLAKE2/3rdparty/BLAKE2 \
 		cxong:tinydir:ec6bff2:tinydir/3rdparty/tinydir
 
-CMAKE_ARGS+=	-DSE_DBDIR="${SE_DBDIR}" \
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DSE_DBDIR="${SE_DBDIR}" \
 		-DSE_LOGDIR="${SE_LOGDIR}" \
 		-DSE_PIDDIR="${SE_PIDDIR}" \
 		-DSE_TAGNAME="${GH_TAGNAME}/freebsd"
 
 CFLAGS+=	-I${LOCALBASE}/include/cpu_features
 
-OPTIONS_DEFINE=	DOCS DEBUG
+OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=		DISCLAIMER.md WARNING.TXT
 CONFLICTS_INSTALL=	softether-4.[0-9]* softether-devel-4.[0-9]*
@@ -62,14 +63,6 @@ SUB_LIST=	SE_DBDIR="${SE_DBDIR}" \
 		SE_PIDDIR="${SE_PIDDIR}"
 SUB_FILES=	pkg-message
 
-.include <bsd.port.options.mk>
-
-# CMAKE_BUILD_TYPE is automatically set by Mk/Uses/cmake.mk
-# just set WITH_DEBUG=yes, CMAKE_ARGS+=-DCMAKE_BUILD_TYPE=Debug takes no effect.
-.if ${PORT_OPTIONS:MDEBUG}
-WITH_DEBUG=	yes
-.endif
-
 .include <bsd.port.pre.mk>
 
 # devel/cpu_features not available on these archs, see devel/cpu_features/Makefile



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303070025.3270PGv5097144>