[Midnightbsd-cvs] mports [23301] trunk/Mk/extensions/cmake.mk: disable the configure wrksrc check for now

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue May 1 09:18:51 EDT 2018


Revision: 23301
          http://svnweb.midnightbsd.org/mports/?rev=23301
Author:   laffer1
Date:     2018-05-01 09:18:50 -0400 (Tue, 01 May 2018)
Log Message:
-----------
disable the configure wrksrc check for now

Modified Paths:
--------------
    trunk/Mk/extensions/cmake.mk

Modified: trunk/Mk/extensions/cmake.mk
===================================================================
--- trunk/Mk/extensions/cmake.mk	2018-05-01 13:17:26 UTC (rev 23300)
+++ trunk/Mk/extensions/cmake.mk	2018-05-01 13:18:50 UTC (rev 23301)
@@ -111,9 +111,9 @@
 
 .if ${cmake_ARGS:Moutsource}
 _CMAKE_MSG=		"===>  Performing out-of-source build"
-CONFIGURE_WRKSRC=	${WRKDIR}/.build
-BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
+CONFIGURE_WRKSRC?=	${WRKDIR}/.build
+BUILD_WRKSRC?=		${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC?=		${CONFIGURE_WRKSRC}
 TEST_WRKSRC?=		${CONFIGURE_WRKSRC}
 .endif
 
@@ -123,12 +123,12 @@
 #             or if CONFIGURE_WRKSRC does not match  BUILD_WRKSRC or INSTALL_WRKSRC
 #             as the build.ninja file won't be where ninja expects it.
 .if empty(cmake_ARGS:Mnoninja) && empty(cmake_ARGS:Mrun) && empty(USES:Mfortran)
-.  if "${CONFIGURE_WRKSRC}" == "${BUILD_WRKSRC}" && "${CONFIGURE_WRKSRC}" == "${INSTALL_WRKSRC}"
+#.  if "${CONFIGURE_WRKSRC}" == "${BUILD_WRKSRC}k" && "${CONFIGURE_WRKSRC}" == "${INSTALL_WRKSRC}"
 .    if ! empty(USES:Mgmake)
 BROKEN=		USES=gmake is incompatible with cmake's ninja-generator
 .    endif
 .      include "${PORTSDIR}/Mk/extensions/ninja.mk"
-.  endif
+#.  endif
 .endif
 
 .if !target(do-configure)



More information about the Midnightbsd-cvs mailing list