Date: Wed, 7 Aug 2019 19:53:27 +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: r508349 - head/devel/llvm90 Message-ID: <201908071953.x77JrRr8002612@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Wed Aug 7 19:53:26 2019 New Revision: 508349 URL: https://svnweb.freebsd.org/changeset/ports/508349 Log: Assorted minor improvements: - Add a build conflict for commonmark-cmark-* when DOCS are enabled. This prevents a failure later on in the build. [0] - Add a new option BE_AMDGPU which can be used to enable the AMDGPU backed used by mesa when BE_NATIVE or BE_FREEBSD is set. Enable this option by default to limit later surprises. [1] - Use LLVM_ENABLE_Z3_SOLVER instead of the now removed CLANG_ANALYZER_ENABLE_Z3_SOLVER to disable Z3 discovery and linkage. PR: 239636 [0], 230789 [1] Modified: head/devel/llvm90/Makefile Modified: head/devel/llvm90/Makefile ============================================================================== --- head/devel/llvm90/Makefile Wed Aug 7 19:30:11 2019 (r508348) +++ head/devel/llvm90/Makefile Wed Aug 7 19:53:26 2019 (r508349) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 9.0.0rc1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang .if ${DISTVERSION:M*rc*} MASTER_SITES= http://prereleases.llvm.org/${LLVM_RELEASE}/${RCDIR} @@ -56,6 +56,7 @@ CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} # redefine CMAKE_INSTALL_MANDIR CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 +CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=OFF CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON_CMD} \ -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \ -DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}m.so @@ -65,19 +66,20 @@ CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON_CMD} \ CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG -OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB +OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLDB OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPENMP -OPTIONS_DEFAULT= BE_STANDARD CLANG EXTRAS LIT LLD LLDB +OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD OPTIONS_SUB= yes +BE_AMDGPU_DESC= AMD GPU backend (required by mesa) BE_FREEBSD_DESC= Backends for FreeBSD architectures BE_FREEBSD_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${FREEBSD_BACKENDS:ts;}" -BE_NATIVE_DESC= Backend(s) for this architecture (${NATIVE_BACKENDS}) +BE_NATIVE_DESC= Backend(s) for this architecture (${_NATIVE_BACKENDS}) BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends .for BE in FREEBSD NATIVE STANDARD @@ -86,8 +88,7 @@ BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|$ CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang CLANG_DISTFILES= cfe-${DISTVERSION}.src${EXTRACT_SUFX} -CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp \ - -DCLANG_ANALYZER_ENABLE_Z3_SOLVER=OFF +CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp CLANG_PORTDOCS= clang CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries @@ -96,6 +97,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRT ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} +DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ @@ -110,7 +112,6 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils LIT_DESC= Install lit and FileCheck test tools -LIT_LIB_DEPENDS= libz3.so:math/z3 LIT_VARS= _USES_PYTHON=python:3.6+ LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} @@ -264,23 +265,29 @@ COMMANDS+= ${LLDB_COMMANDS} .include <bsd.port.pre.mk> .include "${.CURDIR}/Makefile.COMMANDS" -FREEBSD_BACKENDS= AArch64 ARM Mips PowerPC RISCV Sparc X86 +_FREEBSD_BACKENDS= AArch64 ARM Mips PowerPC RISCV Sparc X86 +FREEBSD_BACKENDS= ${_FREEBSD_BACKENDS} .if ${ARCH} == amd64 -NATIVE_BACKENDS= X86 +_NATIVE_BACKENDS= X86 .elif ${ARCH} == arm64 -NATIVE_BACKENDS= AAarch64 +_NATIVE_BACKENDS= AAarch64 .elif ${ARCH:Marmv*} -NATIVE_BACKENDS= ARM +_NATIVE_BACKENDS= ARM .elif ${ARCH} == i386 -NATIVE_BACKENDS= X86 +_NATIVE_BACKENDS= X86 .elif ${ARCH:Mmips*} -NATIVE_BACKENDS= Mips +_NATIVE_BACKENDS= Mips .elif ${ARCH:Mpowerpc*} -NATIVE_BACKENDS= PowerPC +_NATIVE_BACKENDS= PowerPC .elif ${ARCH:Mriscv*} -NATIVE_BACKENDS= RISCV +_NATIVE_BACKENDS= RISCV .endif -STANDARD_BACKENDS= ${FREEBSD_BACKENDS} AMDGPU BPF Hexagon Lanai MSP430 \ +NATIVE_BACKENDS= ${_NATIVE_BACKENDS} +.if ${PORT_OPTIONS:MBE_AMDGPU} +FREEBSD_BACKENDS+= AMDGPU +NATIVE_BACKENDS+= AMDGPU +.endif +STANDARD_BACKENDS= ${_FREEBSD_BACKENDS} AMDGPU BPF Hexagon Lanai MSP430 \ NVPTX SystemZ WebAssembly XCore _BE_LIBS_COMMON= CodeGen Desc Info _BE_LIBS_AArch64= AsmParser Disassembler Utils
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908071953.x77JrRr8002612>