svn commit: r400406 - in head/devel/llvm37: . files

[Brooks Davis]

Author: brooks
Date: Wed Oct 28 18:17:37 2015
New Revision: 400406
URL: https://svnweb.freebsd.org/changeset/ports/400406

Log:
  Mark broken when LLDB is enabled and python >= 3.0 is the default.
  
  Build clang extra tools correctly so a build system patch isn't required.

Deleted:
  head/devel/llvm37/files/extras-patch-cmake_include_hack.diff
Modified:
  head/devel/llvm37/Makefile

Modified: head/devel/llvm37/Makefile
==============================================================================
--- head/devel/llvm37/Makefile	Wed Oct 28 18:05:03 2015	(r400405)
+++ head/devel/llvm37/Makefile	Wed Oct 28 18:17:37 2015	(r400406)
@@ -59,8 +59,6 @@ DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man
 EXTRAS_DESC=		Extra clang tools
 EXTRAS_IMPLIES=		CLANG
 EXTRAS_DISTFILES= clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX}
-EXTRAS_EXTRA_PATCHES= \
-	${PATCHDIR}/extras-patch-cmake_include_hack.diff
 LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld, the LLVM linker
 LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
@@ -240,6 +238,10 @@ LLDB_BUILD_DEPENDS+= \
 	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
 .endif
 
+.if ${PORT_OPTIONS:MLLDB} && ${PYTHON_REL} >= 3000
+BROKEN=	LLDB does not build with Python 3
+.endif
+
 .if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang
 # Evil hack around gcc48 not providing a usable c++11 environment on 9.x
 PLIST_SUB:=	${PLIST_SUB:NLLDB=*} LLDB="@comment "
@@ -255,7 +257,7 @@ post-extract-CLANG-on:
 	${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
 
 post-extract-EXTRAS-on:
-	${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang-tools-extra
+	${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra
 
 post-extract-COMPILER_RT-on:
 	${MV} ${WRKSRC_compiler_rt} ${PATCH_WRKSRC}/tools/compiler-rt
@@ -361,7 +363,7 @@ build-plist:
 	    if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} \
 	    if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
-		if ($$0 !~ /libclang_rt/) {print}}' ${PLIST}.tmp >> ${PLIST}
+	    if ($$0 !~ /libclang_rt/) {print}}' ${PLIST}.tmp >> ${PLIST}
 	${RM} -f ${PLIST}.tmp
 
 check-commands: