Date: Tue, 4 Aug 2015 03:52:52 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393509 - in head/devel: llvm-devel llvm37 Message-ID: <201508040352.t743qq1r078983@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Tue Aug 4 03:52:51 2015 New Revision: 393509 URL: https://svnweb.freebsd.org/changeset/ports/393509 Log: Disable LLDB when the chosen compiler is gcc. On platforms where the system compiler isn't clang (including 9.x), USES=compiler:c++11-lib uses gcc48 as the compiler. Unfortunatly, gcc48 does not provide a sufficently complient c++11 environment to build LLDB when compiled on 9.x and possiably on other platforms. Modified: head/devel/llvm-devel/Makefile head/devel/llvm37/Makefile Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Tue Aug 4 02:54:27 2015 (r393508) +++ head/devel/llvm-devel/Makefile Tue Aug 4 03:52:51 2015 (r393509) @@ -57,7 +57,7 @@ LIT_DESC= Install lit and FileCheck tes LLD_DESC= Install lld, the LLVM linker LLD_GH_PROJECT= lld:lld LLD_GH_TAGNAME= ${LLD_COMMIT}:lld -LLDB_DESC= Install lldb, the LLVM debugger +LLDB_DESC= Install lldb, the LLVM debugger (ignored on 9.x) LLDB_BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 LLDB_GH_PROJECT= lldb:lldb LLDB_GH_TAGNAME= ${LLDB_COMMIT}:lldb @@ -160,8 +160,9 @@ NOT_FOR_ARCH= ia64 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900000 -BROKEN= GCC failing on 8.x +.if ${COMPILER_TYPE} != clang +# Evil hack around gcc48 not providing a usable c++11 environment on 9.x +PLIST_SUB:= ${PLIST_SUB:NLLDB=*} LLDB="@comment " .endif post-extract-CLANG-on: @@ -171,7 +172,9 @@ post-extract-LLD-on: ${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld post-extract-LLDB-on: +.if ${COMPILER_TYPE} == clang ${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb +.endif post-extract-OPENMP-on: ${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp @@ -204,7 +207,9 @@ post-install-DOCS-on: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ post-install-LLDB-on: +.if ${COMPILER_TYPE} == clang ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib +.endif post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ Modified: head/devel/llvm37/Makefile ============================================================================== --- head/devel/llvm37/Makefile Tue Aug 4 02:54:27 2015 (r393508) +++ head/devel/llvm37/Makefile Tue Aug 4 03:52:51 2015 (r393509) @@ -50,7 +50,7 @@ DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man 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 +LLDB_DESC= Install lldb, the LLVM debugger (ignored on 9.x) LLDB_BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library @@ -155,8 +155,9 @@ NOT_FOR_ARCH= ia64 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900000 -BROKEN= GCC failing on 8.x +.if ${COMPILER_TYPE} != clang +# Evil hack around gcc48 not providing a usable c++11 environment on 9.x +PLIST_SUB:= ${PLIST_SUB:NLLDB=*} LLDB="@comment " .endif post-extract-CLANG-on: @@ -166,7 +167,9 @@ post-extract-LLD-on: ${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld post-extract-LLDB-on: +.if ${COMPILER_TYPE} == clang ${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb +.endif post-extract-OPENMP-on: ${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp @@ -200,7 +203,9 @@ post-install-DOCS-on: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ post-install-LLDB-on: +.if ${COMPILER_TYPE} == clang ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib +.endif post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508040352.t743qq1r078983>