From owner-svn-ports-head@freebsd.org Wed Apr 5 21:13:00 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9EE59D3068B; Wed, 5 Apr 2017 21:13:00 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 62108A62; Wed, 5 Apr 2017 21:13:00 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v35LCxxb074831; Wed, 5 Apr 2017 21:12:59 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v35LCxwQ074827; Wed, 5 Apr 2017 21:12:59 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201704052112.v35LCxwQ074827@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Wed, 5 Apr 2017 21:12:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437835 - in head/devel: llvm-devel llvm38 llvm39 llvm40 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Apr 2017 21:13:00 -0000 Author: brooks Date: Wed Apr 5 21:12:58 2017 New Revision: 437835 URL: https://svnweb.freebsd.org/changeset/ports/437835 Log: The LLDB option requires CLANG so make it imply CLANG. Attempt to reduce the size of WITH_DEBUG builds. Reports suggest they are still enormous. Garbage collect some FreeBSD 9.x bits. Modified: head/devel/llvm-devel/Makefile head/devel/llvm38/Makefile head/devel/llvm39/Makefile head/devel/llvm40/Makefile Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Wed Apr 5 20:13:00 2017 (r437834) +++ head/devel/llvm-devel/Makefile Wed Apr 5 21:12:58 2017 (r437835) @@ -80,11 +80,12 @@ LLD_DESC= Install lld, the LLVM linker LLD_GH_PROJECT= lld:lld LLD_GH_SUBDIR= tools/lld:lld LLD_GH_TAGNAME= ${LLD_COMMIT}:lld -LLDB_DESC= Install lldb, the LLVM debugger LLDB_BUILD_DEPENDS= swig:devel/swig13 +LLDB_DESC= Install lldb, the LLVM debugger LLDB_GH_PROJECT= lldb:lldb LLDB_GH_SUBDIR= tools/lldb:lldb LLDB_GH_TAGNAME= ${LLDB_COMMIT}:lldb +LLDB_IMPLIES= CLANG LLDB_USES= execinfo LLDB_VARS= _USES_PYTHON=python OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library Modified: head/devel/llvm38/Makefile ============================================================================== --- head/devel/llvm38/Makefile Wed Apr 5 20:13:00 2017 (r437834) +++ head/devel/llvm38/Makefile Wed Apr 5 21:12:58 2017 (r437835) @@ -71,9 +71,10 @@ EXTRAS_DISTFILES= clang-tools-extra-${DI LIT_DESC= Install lit and FileCheck test tools LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} -LLDB_DESC= Install lldb, the LLVM debugger (ignored on 9.x) LLDB_BUILD_DEPENDS= swig:devel/swig13 +LLDB_DESC= Install lldb, the LLVM debugger LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} +LLDB_IMPLIES= CLANG OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp-patch-bug32279 @@ -81,6 +82,13 @@ GOLD_DESC= Build the LLVM Gold plugin f GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils +.if defined(WITH_DEBUG) +CMAKE_BUILD_TYPE= RelWithDebInfo +STRIP= +.endif + +_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd + # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel .for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP WRKSRC_${option:tl}= ${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//} @@ -210,7 +218,6 @@ NOT_FOR_ARCH= ia64 .include -_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd .if ${ARCH} == "amd64" _COMPILER_RT_LIBS= \ libclang_rt.asan-preinit-x86_64.a \ @@ -247,7 +254,6 @@ _COMPILER_RT_LIBS+= \ libclang_rt.ubsan_standalone_cxx-i386.a .endif -.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang .if ${PORT_OPTIONS:MEXTRAS} COMMANDS+= ${EXTRAS_COMMANDS} MAN1SRCS+= extraclangtools.1 @@ -258,7 +264,6 @@ PORTDOCS+= clang-tools COMMANDS+= lld PORTDOCS+= lld .endif -.endif .if ${PYTHON_REL} < 3400 LLDB_BUILD_DEPENDS+= \ @@ -269,30 +274,17 @@ LLDB_BUILD_DEPENDS+= \ 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:NEXTRAS=*} EXTRAS="@comment " -PLIST_SUB:= ${PLIST_SUB:NLLD=*} LLD="@comment " -PLIST_SUB:= ${PLIST_SUB:NLLDB=*} LLDB="@comment " -.endif - post-extract-CLANG-on: ${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang post-extract-EXTRAS-on: -.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang ${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra -.endif post-extract-LLD-on: -.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang ${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld -.endif post-extract-LLDB-on: -.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang ${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb -.endif post-extract-OPENMP-on: ${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp @@ -347,15 +339,12 @@ post-install-DOCS-on: .if ${PORT_OPTIONS:MCLANG} post-install-DOCS-off: ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1 - ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/ - ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ + ${RM} -r ${STAGEDIR}${LLVM_PREFIX}/share/man .endif post-install-LLDB-on: -.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/lldb/Host/windows/getopt -.endif post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ @@ -465,5 +454,15 @@ svn-patch-lldb: svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE} svn diff -c ${PATCH_REV} ${_LLVM_BASE} | >> ${_PATCH_FILE} .endif +.if make(svn-patch-llvm) +.if !defined(PATCH_REV) +.error svn-patch-llvm requires that PATCH_REV be set +.endif +_PATCH_FILE=${FILESDIR}/patch-svn-${PATCH_REV} +_LLVM_BASE=http://llvm.org/svn/llvm-project/llvm/trunk +svn-patch-llvm: + svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE} + svn diff -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE} +.endif .include Modified: head/devel/llvm39/Makefile ============================================================================== --- head/devel/llvm39/Makefile Wed Apr 5 20:13:00 2017 (r437834) +++ head/devel/llvm39/Makefile Wed Apr 5 21:12:58 2017 (r437835) @@ -84,16 +84,24 @@ LIT_DESC= Install lit and FileCheck tes LIT_VARS= _USES_PYTHON=python LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} -LLDB_DESC= Install lldb, the LLVM debugger (ignored on 9.x) -LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb-patch-tools_lldb_source_Host_common_FileSpec.cpp LLDB_BUILD_DEPENDS= swig:devel/swig13 +LLDB_DESC= Install lldb, the LLVM debugger LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} +LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb-patch-tools_lldb_source_Host_common_FileSpec.cpp +LLDB_IMPLIES= CLANG LLDB_USES= execinfo LLDB_VARS= _USES_PYTHON=python OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp-patch-bug32279 +.if defined(WITH_DEBUG) +CMAKE_BUILD_TYPE= RelWithDebInfo +STRIP= +.endif + +_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd + # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel .for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP WRKSRC_${option:tl}= ${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//} @@ -226,7 +234,6 @@ NOT_FOR_ARCH= ia64 .include -_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd .if ${ARCH} == "amd64" _COMPILER_RT_LIBS= \ libclang_rt.asan-preinit-x86_64.a \ Modified: head/devel/llvm40/Makefile ============================================================================== --- head/devel/llvm40/Makefile Wed Apr 5 20:13:00 2017 (r437834) +++ head/devel/llvm40/Makefile Wed Apr 5 21:12:58 2017 (r437835) @@ -82,15 +82,23 @@ LIT_DESC= Install lit and FileCheck tes LIT_VARS= _USES_PYTHON=python LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} -LLDB_DESC= Install lldb, the LLVM debugger (ignored on 9.x) LLDB_BUILD_DEPENDS= swig:devel/swig13 +LLDB_DESC= Install lldb, the LLVM debugger LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} +LLDB_IMPLIES= CLANG LLDB_USES= execinfo LLDB_VARS= _USES_PYTHON=python OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp-patch-bug32279 +.if defined(WITH_DEBUG) +CMAKE_BUILD_TYPE= RelWithDebInfo +STRIP= +.endif + +_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd + # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel .for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP WRKSRC_${option:tl}= ${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//} @@ -238,7 +246,6 @@ NOT_FOR_ARCH= ia64 .include -_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd .if ${ARCH} == "amd64" _COMPILER_RT_LIBS= \ libclang_rt.asan-preinit-x86_64.a \