Date: Thu, 17 Jan 2019 23:29:30 +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: r490610 - in head/devel: llvm40 llvm40/files llvm50 llvm50/files llvm60 llvm60/files llvm70 Message-ID: <201901172329.x0HNTUMW041084@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Jan 17 23:29:30 2019 New Revision: 490610 URL: https://svnweb.freebsd.org/changeset/ports/490610 Log: More throughly disable assertions. This works around USES=cmake overriding the CFLAGS used to build. [0] devel/llvm[45]0: Fix build on GCC systems. [1] devel/llvm[456]: Avoid realpath calls where possible in the wrapper script. [2] PR: 233506 [0], 234647 [1], 234937 [1] Submitted by: greg@unrelenting.technology [0], pkubaj@anongoth.pl [1], bdrewery [2] Differential Revision: https://reviews.freebsd.org/D17990 Modified: head/devel/llvm40/Makefile head/devel/llvm40/files/llvm-wrapper.sh.in head/devel/llvm50/Makefile head/devel/llvm50/files/llvm-wrapper.sh.in head/devel/llvm60/Makefile head/devel/llvm60/files/llvm-wrapper.sh.in head/devel/llvm70/Makefile Modified: head/devel/llvm40/Makefile ============================================================================== --- head/devel/llvm40/Makefile Thu Jan 17 23:27:11 2019 (r490609) +++ head/devel/llvm40/Makefile Thu Jan 17 23:29:30 2019 (r490610) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 4.0.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -25,8 +25,7 @@ LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -USES= cmake compiler:c++11-lib libedit perl5 tar:xz \ - shebangfix +USES= cmake compiler libedit perl5 tar:xz shebangfix _USES_PYTHON?= python:2.7,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib @@ -46,6 +45,11 @@ CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 +# Disable assertions. They should be disabled by cmake, but USES=cmake +# overrides -DCMAKE_*_FLAGS_RELEASE. +CFLAGS+= -DNDEBUG +CXXFLAGS+= -DNDEBUG + OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPENMP @@ -185,6 +189,11 @@ EXTRAS_LIBS= libclangApplyReplacements \ libfindAllSymbols \ libmodernizeCore EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTRAS_LIBS:tW:C/ */|/g} + +# Force GCC 5 on non-clang systems because GCC 8 won't compile this code. +.if exists(/usr/lib/libstdc++.so) +USE_GCC= 5 +.endif .include <bsd.port.options.mk> Modified: head/devel/llvm40/files/llvm-wrapper.sh.in ============================================================================== --- head/devel/llvm40/files/llvm-wrapper.sh.in Thu Jan 17 23:27:11 2019 (r490609) +++ head/devel/llvm40/files/llvm-wrapper.sh.in Thu Jan 17 23:29:30 2019 (r490610) @@ -4,7 +4,8 @@ LLVM_PREFIX="%%LLVM_PREFIX%%" LLVM_SUFFIX="%%LLVM_SUFFIX%%" -tool=$(/bin/realpath $0) +tool=$0 +[ -L "$tool" ] && tool=$(/bin/realpath $tool) tool=${tool##*/} tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \ Modified: head/devel/llvm50/Makefile ============================================================================== --- head/devel/llvm50/Makefile Thu Jan 17 23:27:11 2019 (r490609) +++ head/devel/llvm50/Makefile Thu Jan 17 23:29:30 2019 (r490610) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 5.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang MASTER_SITES= https://releases.llvm.org/${LLVM_RELEASE}/${RCDIR} LOCAL/brooks PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -28,8 +28,7 @@ LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -USES= cmake compiler:c++11-lib libedit perl5 tar:xz \ - shebangfix +USES= cmake compiler libedit perl5 tar:xz shebangfix _USES_PYTHON?= python:2.7,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib @@ -49,6 +48,11 @@ CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 +# Disable assertions. They should be disabled by cmake, but USES=cmake +# overrides -DCMAKE_*_FLAGS_RELEASE. +CFLAGS+= -DNDEBUG +CXXFLAGS+= -DNDEBUG + OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPENMP @@ -194,6 +198,11 @@ EXTRAS_LIBS= libclangApplyReplacements \ libfindAllSymbols \ libmodernizeCore EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTRAS_LIBS:tW:C/ */|/g} + +# Force GCC 5 on non-clang systems because GCC 8 won't compile this code. +.if exists(/usr/lib/libstdc++.so) +USE_GCC= 5 +.endif .include <bsd.port.options.mk> Modified: head/devel/llvm50/files/llvm-wrapper.sh.in ============================================================================== --- head/devel/llvm50/files/llvm-wrapper.sh.in Thu Jan 17 23:27:11 2019 (r490609) +++ head/devel/llvm50/files/llvm-wrapper.sh.in Thu Jan 17 23:29:30 2019 (r490610) @@ -4,7 +4,8 @@ LLVM_PREFIX="%%LLVM_PREFIX%%" LLVM_SUFFIX="%%LLVM_SUFFIX%%" -tool=$(/bin/realpath $0) +tool=$0 +[ -L "$tool" ] && tool=$(/bin/realpath $tool) tool=${tool##*/} tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \ Modified: head/devel/llvm60/Makefile ============================================================================== --- head/devel/llvm60/Makefile Thu Jan 17 23:27:11 2019 (r490609) +++ head/devel/llvm60/Makefile Thu Jan 17 23:29:30 2019 (r490610) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 6.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel lang MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -25,8 +25,7 @@ LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -USES= cmake compiler:c++11-lib libedit perl5 tar:xz \ - shebangfix +USES= cmake compiler:c++11-lib libedit perl5 tar:xz shebangfix _USES_PYTHON?= python:2.7,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib @@ -45,6 +44,11 @@ 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 + +# Disable assertions. They should be disabled by cmake, but USES=cmake +# overrides -DCMAKE_*_FLAGS_RELEASE. +CFLAGS+= -DNDEBUG +CXXFLAGS+= -DNDEBUG OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP Modified: head/devel/llvm60/files/llvm-wrapper.sh.in ============================================================================== --- head/devel/llvm60/files/llvm-wrapper.sh.in Thu Jan 17 23:27:11 2019 (r490609) +++ head/devel/llvm60/files/llvm-wrapper.sh.in Thu Jan 17 23:29:30 2019 (r490610) @@ -4,7 +4,8 @@ LLVM_PREFIX="%%LLVM_PREFIX%%" LLVM_SUFFIX="%%LLVM_SUFFIX%%" -tool=$(/bin/realpath $0) +tool=$0 +[ -L "$tool" ] && tool=$(/bin/realpath $tool) tool=${tool##*/} tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \ Modified: head/devel/llvm70/Makefile ============================================================================== --- head/devel/llvm70/Makefile Thu Jan 17 23:27:11 2019 (r490609) +++ head/devel/llvm70/Makefile Thu Jan 17 23:29:30 2019 (r490610) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 7.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -45,6 +45,11 @@ 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 + +# Disable assertions. They should be disabled by cmake, but USES=cmake +# overrides -DCMAKE_*_FLAGS_RELEASE. +CFLAGS+= -DNDEBUG +CXXFLAGS+= -DNDEBUG OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901172329.x0HNTUMW041084>