Page MenuHomeFreeBSD
Files F145419825

D17990.id.diff
No OneTemporary
Actions

D17990.id.diff
View Options

Index: head/devel/llvm40/Makefile
===================================================================
--- head/devel/llvm40/Makefile
+++ head/devel/llvm40/Makefile
@@ -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 @@
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+= -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 @@
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>
Index: head/devel/llvm40/files/llvm-wrapper.sh.in
===================================================================
--- head/devel/llvm40/files/llvm-wrapper.sh.in
+++ head/devel/llvm40/files/llvm-wrapper.sh.in
@@ -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" \
Index: head/devel/llvm50/Makefile
===================================================================
--- head/devel/llvm50/Makefile
+++ head/devel/llvm50/Makefile
@@ -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 @@
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+= -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 @@
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>
Index: head/devel/llvm50/files/llvm-wrapper.sh.in
===================================================================
--- head/devel/llvm50/files/llvm-wrapper.sh.in
+++ head/devel/llvm50/files/llvm-wrapper.sh.in
@@ -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" \
Index: head/devel/llvm60/Makefile
===================================================================
--- head/devel/llvm60/Makefile
+++ head/devel/llvm60/Makefile
@@ -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 @@
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 @@
# 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
Index: head/devel/llvm60/files/llvm-wrapper.sh.in
===================================================================
--- head/devel/llvm60/files/llvm-wrapper.sh.in
+++ head/devel/llvm60/files/llvm-wrapper.sh.in
@@ -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" \
Index: head/devel/llvm70/Makefile
===================================================================
--- head/devel/llvm70/Makefile
+++ head/devel/llvm70/Makefile
@@ -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 @@
# 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

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 20, 3:16 PM (15 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28900649
Default Alt Text
D17990.id.diff (6 KB)

Event Timeline