From owner-svn-ports-all@freebsd.org Mon Mar 18 05:19:33 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13840152FC05; Mon, 18 Mar 2019 05:19:33 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB8D770AF2; Mon, 18 Mar 2019 05:19:32 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 879361CC7A; Mon, 18 Mar 2019 05:19:32 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2I5JWiB073991; Mon, 18 Mar 2019 05:19:32 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2I5JWmn073990; Mon, 18 Mar 2019 05:19:32 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201903180519.x2I5JWmn073990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Mon, 18 Mar 2019 05:19:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496122 - head/security/softether5 X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: head/security/softether5 X-SVN-Commit-Revision: 496122 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AB8D770AF2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.93)[-0.933,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Mar 2019 05:19:33 -0000 Author: meta Date: Mon Mar 18 05:19:32 2019 New Revision: 496122 URL: https://svnweb.freebsd.org/changeset/ports/496122 Log: security/softether5: conditionalize dependence on devel/cpu_features devel/cpu_features is not available on some architectures after r496118. Furturemore, upstream doesn't require cpu_features on some architectures such as armv7l, aarch64, s390x. Add CFLAGS=-DSKIP_CPU_FEATURES on architectures devel/cpu_features is not available. Tested no-harm on amd64. Modified: head/security/softether5/Makefile Modified: head/security/softether5/Makefile ============================================================================== --- head/security/softether5/Makefile Mon Mar 18 05:04:07 2019 (r496121) +++ head/security/softether5/Makefile Mon Mar 18 05:19:32 2019 (r496122) @@ -2,7 +2,7 @@ PORTNAME= softether DISTVERSION= 5.01.9669 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security PKGNAMESUFFIX= 5 @@ -12,8 +12,6 @@ COMMENT= SoftEther VPN 5 (Developer Edition) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/include/cpu_features_macros.h:devel/cpu_features - USES+= cmake:noninja dos2unix iconv:wchar_t localbase:ldflags ncurses readline ssl USE_RC_SUBR= softether_bridge softether_client softether_server USE_LDCONFIG= yes @@ -45,8 +43,16 @@ PLIST_SUB= SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGD SUB_LIST= SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" SUB_FILES= pkg-message -.include +.include +# devel/cpu_features not available on these archs, see devel/cpu_features/Makefile +.if (${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == mips || ${ARCH} == mips64) +# skip cpu_features when devel/cpu_features is not available +CFLAGS+= -DSKIP_CPU_FEATURES +.else +BUILD_DEPENDS+= ${LOCALBASE}/include/cpu_features_macros.h:devel/cpu_features +.endif + pre-configure: # not a GNU configure @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./configure @@ -107,4 +113,4 @@ post-install-DOCS-on: ${FIND} ${WRKSRC} -name ${doc} -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR} \; .endfor -.include +.include