pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

coreclr-git: We need USE_CMAKE to get CMAKE_ARGS defined



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Feb 8 01:58:44 2016 +0100
Changeset:	a8b8558a67d8a3373fade8659c37eccd14c4d947

Modified Files:
	coreclr-git/Makefile

Log Message:
coreclr-git: We need USE_CMAKE to get CMAKE_ARGS defined

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a8b8558a67d8a3373fade8659c37eccd14c4d947

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 coreclr-git/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diffs:
diff --git a/coreclr-git/Makefile b/coreclr-git/Makefile
index 9913156..e8c4cbe 100644
--- a/coreclr-git/Makefile
+++ b/coreclr-git/Makefile
@@ -12,8 +12,8 @@ HOMEPAGE=	https://github.com/dotnet/coreclr
 COMMENT=	The .NET Core runtime and the base library
 LICENSE=	mit
 
-# We invoke CMake through build.sh
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+# We need to set CMake this way to get defined CMAKE_ARGS
+USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	bash
@@ -21,9 +21,12 @@ REPLACE_BASH+=	build.sh
 
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
+do-configure:
+	${RUN} ${ECHO} Skip configure and call CMake via build.sh
+
 do-build:
 	${RUN} cd ${WRKSRC} && \
-	${PKGSRC_SETENV} CMAKE_ENV_EXTRA="${CONFIGURE_ENV}" CMAKE_ARGS_EXTRA="${CMAKE_ARGS}" PYTHON=${PYTHONBIN} ./build.sh
+	CMAKE_ENV_EXTRA="${PKGSRC_SETENV} ${CONFIGURE_ENV}" CMAKE_ARGS_EXTRA="${CMAKE_ARGS}" PYTHON=${PYTHONBIN} ./build.sh
 
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../wip/llvm-git/buildlink3.mk"


Home | Main Index | Thread Index | Old Index