Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Mar 2019 08:43:09 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r495775 - head/devel/flang
Message-ID:  <201903150843.x2F8h9VC087000@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Fri Mar 15 08:43:09 2019
New Revision: 495775
URL: https://svnweb.freebsd.org/changeset/ports/495775

Log:
  devel/flang: Attempt to fix TESTS option
  
  In r479159 the TESTS option was incorrectly switched to options
  helpers.  Options helpers are ineffective when set after
  bsd.port.options.mk and it should have used the CMAKE_BOOL helper.
  
  Reported by:	tobik (in D19553)

Modified:
  head/devel/flang/Makefile

Modified: head/devel/flang/Makefile
==============================================================================
--- head/devel/flang/Makefile	Fri Mar 15 08:33:17 2019	(r495774)
+++ head/devel/flang/Makefile	Fri Mar 15 08:43:09 2019	(r495775)
@@ -3,7 +3,7 @@
 
 PORTNAME=	flang
 DISTVERSION=	6.0-g20180904
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	jmd@FreeBSD.org
@@ -20,9 +20,6 @@ RUN_DEPENDS=	llvm60>=0:devel/llvm60 \
 		flang-clang>=0:devel/flang-clang
 LIB_DEPENDS=	libpgmath.so:math/libpgmath
 
-OPTIONS_DEFINE=	TESTS
-TESTS_DESC=	build unit tests for flang
-
 USES=		cmake:noninja compiler:c++11-lib libedit perl5 tar:xz \
 		shebangfix
 _USES_PYTHON?=	python:build
@@ -43,10 +40,13 @@ CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-confi
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/flang
 
-.include <bsd.port.options.mk>
-TESTS_CMAKE_ON=	FLANG_INCLUDE_TESTS
-
 MAKE_JOBS_UNSAFE=	yes
+
+OPTIONS_DEFINE=	TESTS
+
+TESTS_DESC=	build unit tests for flang
+
+TESTS_CMAKE_BOOL=	FLANG_INCLUDE_TESTS
 
 post-patch:
 	@${CP} -r  ${WRKSRC}/tools/flang2/flang2exe/x86_64-Linux ${WRKSRC}/tools/flang2/flang2exe/x86_64-FreeBSD



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