svn commit: r354057 - branches/2014Q2/devel/llvm-devel

[Brooks Davis]

Author: brooks
Date: Wed May 14 13:33:25 2014
New Revision: 354057
URL: http://svnweb.freebsd.org/changeset/ports/354057
QAT: https://qat.redports.org/buildarchive/r354057/

Log:
  Merge r351292,353107
  
  Make PREFIX clean.
  
  Use more bsd.options.mk features.
  
  Mark broken prior to 9.0 due to bizzare errors from gcc on 8.4.
  
  Our use of cmake is unconventional so we need to pass CC and CXX to it
  directly rather than relying on ports infrastructure
  
  Sponsored by:   DARPA, AFRL
  Approved by:	portmgr (miwi)

Modified:
  branches/2014Q2/devel/llvm-devel/Makefile
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/devel/llvm-devel/Makefile
==============================================================================
--- branches/2014Q2/devel/llvm-devel/Makefile	Wed May 14 13:33:11 2014	(r354056)
+++ branches/2014Q2/devel/llvm-devel/Makefile	Wed May 14 13:33:25 2014	(r354057)
@@ -45,6 +45,16 @@ LTOPLUGIN_DESC=	Build LTO plugin (requir
 OPTIONS_DEFAULT=	CMAKE LIT MANPAGES
 OPTIONS_SUB=	yes
 
+ASSERTS_CONFIGURE_ENABLE=	assertions
+CMAKE_BUILD_DEPENDS=		cmake:${PORTSDIR}/devel/cmake
+DOCS_BUILD_DEPENDS=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_CONFIGURE_ENABLE=		docs
+LTOPLUGIN_BUILD_DEPENDS=	ld.gold:${PORTSDIR}/devel/binutils
+LTOPLUGIN_RUN_DEPENDS=		ld.gold:${PORTSDIR}/devel/binutils
+LTOPLUGIN_CONFIGURE_ON=		--with-binutils-include=${LOCALBASE}/include
+LTOPLUGIN_PLIST_FILES=		llvm${LLVM_SUFFIX}/lib/LLVMgold.so
+MANPAGES_BUILD_DEPENDS=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+
 LLVM_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}
 
@@ -85,28 +95,15 @@ STRIP_LIBS=	BugpointPasses.so \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MASSERTS}
-CONFIGURE_ARGS+=	--enable-assertions
 RELEASE_TYPE=		Release+Asserts
 .else
-CONFIGURE_ARGS+=	--disable-assertions
 RELEASE_TYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MCMAKE}
-BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
 PORTDATA+=	cmake
 .endif
 
-.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=	--enable-docs
-.else
-CONFIGURE_ARGS+=	--disable-docs
-.endif
-
 .if ${PORT_OPTIONS:MLIT}
 MAN1SRCS+=		lit.1
 USE_PYTHON=		yes
@@ -115,13 +112,6 @@ LIT_COMMANDS=		lit llvm-lit FileCheck
 USE_PYTHON_BUILD=	yes
 .endif
 
-.if ${PORT_OPTIONS:MLTOPLUGIN}
-BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
-PLIST_FILES+=		llvm${LLVM_SUFFIX}/lib/LLVMgold.so
-.endif
-
 .if ${PORT_OPTIONS:MMANPAGES}
 MAN1SRCS+=	bugpoint.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
 		llvm-bcanalyzer.1 llvm-config.1 llvm-cov.1 llvm-diff.1 \
@@ -133,6 +123,10 @@ PLIST_FILES+=	${MAN1SRCS:S|^|man/man1/|:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 900000
+BROKEN=	GCC failing on 8.x
+.endif
+
 .if !defined(SVN_REV)
 .if defined(BOOTSTRAP)
 LANG=		"C"
@@ -178,7 +172,10 @@ post-patch:
 .if ${PORT_OPTIONS:MCMAKE}
 post-configure:
 	${MKDIR} ${WRKDIR}/cmake
-	cd ${WRKDIR}/cmake && cmake -G "Unix Makefiles" ${WRKSRC}
+	cd ${WRKDIR}/cmake && cmake -G "Unix Makefiles" \
+	    -DCMAKE_C_COMPILER:STRING="${CC}" \
+	    -DCMAKE_CXX_COMPILER:STRING="${CXX}" \
+	    ${WRKSRC}
 	${REINPLACE_CMD} -e 's|${WRKDIR}/cmake|${LLVM_PREFIX}|' \
 	    -e 's|${WRKSRC}/cmake/modules|${DATADIR}/cmake|' \
 	    ${WRKDIR}/cmake/share/llvm/cmake/LLVMConfig.cmake
@@ -229,9 +226,9 @@ post-install:
 	    ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
-	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \
-	    ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX}
+	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_PROGRAM} ${WRKSRC}/${RELEASE_TYPE}/bin/FileCheck \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \