llvm*: don't set WRKSRC to build dir, use CONFIGURE_DIRS for that

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Feb 21 01:21:31 2016 +0100
Changeset:	0947edb45d5b67f36d68fcb232ca2a0b4aa392b3

Modified Files:
	llvm-git/Makefile
	llvm/Makefile

Log Message:
llvm*: don't set WRKSRC to build dir, use CONFIGURE_DIRS for that

WRKSRC must be the source dir for pkgsrc patches to work.
Also move CMAKE_ARGS to the top of the Makefile.

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

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

diffstat:
 llvm-git/Makefile | 28 +++++++++++++---------------
 llvm/Makefile     | 27 ++++++++++++---------------
 2 files changed, 25 insertions(+), 30 deletions(-)

diffs:
diff --git a/llvm-git/Makefile b/llvm-git/Makefile
index 0d6f556..c311a05 100644
--- a/llvm-git/Makefile
+++ b/llvm-git/Makefile
@@ -11,15 +11,22 @@ HOMEPAGE=	http://llvm.org/
 COMMENT=	Low Level Virtual Machine compiler infrastructure
 LICENSE=	modified-bsd
 
-WRKSRC=			${WRKDIR}/build
-
 USE_LANGUAGES=		c c++
-USE_CMAKE+=		yes
+USE_CMAKE=		yes
 GCC_REQD+=		4.8
+PY_PATCHPLIST=		yes
 
-CHECK_PORTABILITY_SKIP=	utils/buildit/build_llvm
+WRKSRC=			${WRKDIR}/${PKGBASE}
+CONFIGURE_DIRS=		${WRKDIR}/build
+CMAKE_ARG_PATH=		${WRKSRC}
 
-PY_PATCHPLIST=		yes
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=	-DCMAKE_C_COMPILER=gcc
+CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=g++
+# Try to optimize building LLVM for now.
+CMAKE_ARGS+=	-DLLVM_TARGETS_TO_BUILD="X86"
+
+CHECK_PORTABILITY_SKIP=	utils/buildit/build_llvm
 
 REPLACE_PERL+=		${WRKDIR}/llvm/utils/GenLibDeps.pl
 REPLACE_PERL+=		${WRKDIR}/llvm/utils/UpdateCMakeLists.pl
@@ -63,17 +70,8 @@ REPLACE_PYTHON+=	${WRKDIR}/llvm/utils/wciia.py
 TEST_TARGET=		check-lldb
 TEST_ENV+=		LD_LIBRARY_PATH=${WRKSRC}/lib
 
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=	-DCMAKE_C_COMPILER=gcc
-CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=g++
-
-# Try to optimize building LLVM for now.
-CMAKE_ARGS+=	-DLLVM_TARGETS_TO_BUILD="X86"
-
-CMAKE_ARG_PATH=	${WRKDIR}/llvm
-
 post-extract:
-	${RUN} mkdir -p ${WRKSRC}
+	${RUN} mkdir -p ${WRKDIR}/build
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../wip/mk/git-package.mk"
diff --git a/llvm/Makefile b/llvm/Makefile
index eaa7303..ab16144 100644
--- a/llvm/Makefile
+++ b/llvm/Makefile
@@ -12,15 +12,21 @@ HOMEPAGE=	http://llvm.org/
 COMMENT=	Low Level Virtual Machine compiler infrastructure
 LICENSE=	modified-bsd
 
-WRKSRC=			${WRKDIR}/build
-
 USE_LANGUAGES=		c c++
-USE_CMAKE+=		yes
+USE_CMAKE=		yes
 GCC_REQD+=		4.8
+PY_PATCHPLIST=		yes
 
-CHECK_PORTABILITY_SKIP=	utils/buildit/build_llvm
+CONFIGURE_DIRS=         ${WRKDIR}/build
+CMAKE_ARG_PATH=		${WRKSRC}
 
-PY_PATCHPLIST=		yes
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=	-DCMAKE_C_COMPILER=gcc
+CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=g++
+# Try to optimize building LLVM for now.
+CMAKE_ARGS+=	-DLLVM_TARGETS_TO_BUILD="X86"
+
+CHECK_PORTABILITY_SKIP=	utils/buildit/build_llvm
 
 REPLACE_PERL+=		${WRKDIR}/llvm/utils/GenLibDeps.pl
 REPLACE_PERL+=		${WRKDIR}/llvm/utils/UpdateCMakeLists.pl
@@ -64,17 +70,8 @@ REPLACE_PYTHON+=	${WRKDIR}/llvm/utils/wciia.py
 TEST_TARGET=		check-lldb
 TEST_ENV+=		LD_LIBRARY_PATH=${WRKSRC}/lib
 
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=	-DCMAKE_C_COMPILER=gcc
-CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=g++
-
-# Try to optimize building LLVM for now.
-CMAKE_ARGS+=	-DLLVM_TARGETS_TO_BUILD="X86"
-
-CMAKE_ARG_PATH=	${WRKDIR}/${DISTNAME}
-
 post-extract:
-	${RUN} mkdir -p ${WRKSRC}
+	${RUN} mkdir -p ${WRKDIR}/build
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"