Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Jan 2021 22:25:56 +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: r560814 - in head/devel/llvm11: . files/compiler-rt
Message-ID:  <202101082225.108MPuio061218@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Fri Jan  8 22:25:56 2021
New Revision: 560814
URL: https://svnweb.freebsd.org/changeset/ports/560814

Log:
  llvm11: Update to 11.0.1 release
  
  Force linkage with the base system's ncurses in lldb and disable
  terminfo to avoid untracked dependencies when ncurses is installed from
  ports. Ideally we'd also use the base libtinfo, but I have been unable
  to find a way to force it to be used.
  
  PR:		252120

Modified:
  head/devel/llvm11/Makefile
  head/devel/llvm11/distinfo
  head/devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h

Modified: head/devel/llvm11/Makefile
==============================================================================
--- head/devel/llvm11/Makefile	Fri Jan  8 22:14:43 2021	(r560813)
+++ head/devel/llvm11/Makefile	Fri Jan  8 22:25:56 2021	(r560814)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	11.0.0
-PORTREVISION=	1
+DISTVERSION=	11.0.1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
@@ -56,6 +56,8 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
 CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
 CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
 CMAKE_ARGS+=	-DPython3_EXECUTABLE=${PYTHON_CMD}
+# LLVM likes to pick up ${LOCALBASE}/lib/libtinfo.so.*
+CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
 
 # Disable assertions.  They should be disabled by cmake, but USES=cmake
 # overrides -DCMAKE_*_FLAGS_RELEASE.
@@ -132,7 +134,12 @@ LLD_LINK_IMPLIES=	LLD
 LLDB_BUILD_DEPENDS=	swig:devel/swig \
 			${PY_ENUM34}
 LLDB_CMAKE_ON=		-DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \
-			-DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so
+			-DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \
+			-DCURSES_INCLUDE_PATH=/usr/include \
+			-DCURSES_CURSES_LIBRARY=/usr/lib/libcurses.so \
+			-DCURSES_FORM_LIBRARY=/usr/lib/libform.so \
+			-DCURSES_NCURSES_LIBRARY=/usr/lib/libncurses.so \
+			-DPANEL_LIBRARIES=/usr/lib/libpanel.so
 LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
 LLDB_EXTRA_PATCHES=	${PATCHDIR}/lldb
@@ -301,7 +308,7 @@ FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
 .if ${ARCH} == amd64
 _NATIVE_BACKENDS=	X86
 .elif ${ARCH} == arm64
-_NATIVE_BACKENDS=	AAarch64
+_NATIVE_BACKENDS=	AArch64
 .elif ${ARCH:Marmv*}
 _NATIVE_BACKENDS=	ARM
 .elif ${ARCH} == i386

Modified: head/devel/llvm11/distinfo
==============================================================================
--- head/devel/llvm11/distinfo	Fri Jan  8 22:14:43 2021	(r560813)
+++ head/devel/llvm11/distinfo	Fri Jan  8 22:25:56 2021	(r560814)
@@ -1,15 +1,15 @@
-TIMESTAMP = 1602536201
-SHA256 (llvm-11.0.0.src.tar.xz) = 913f68c898dfb4a03b397c5e11c6a2f39d0f22ed7665c9cefa87a34423a72469
-SIZE (llvm-11.0.0.src.tar.xz) = 39480848
-SHA256 (clang-11.0.0.src.tar.xz) = 0f96acace1e8326b39f220ba19e055ba99b0ab21c2475042dbc6a482649c5209
-SIZE (clang-11.0.0.src.tar.xz) = 14982988
-SHA256 (compiler-rt-11.0.0.src.tar.xz) = 374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234
-SIZE (compiler-rt-11.0.0.src.tar.xz) = 2141408
-SHA256 (clang-tools-extra-11.0.0.src.tar.xz) = fed318f75d560d0e0ae728e2fb8abce71e9d0c60dd120c9baac118522ce76c09
-SIZE (clang-tools-extra-11.0.0.src.tar.xz) = 1512436
-SHA256 (lld-11.0.0.src.tar.xz) = efe7be4a7b7cdc6f3bcf222827c6f837439e6e656d12d6c885d5c8a80ff4fd1c
-SIZE (lld-11.0.0.src.tar.xz) = 1247188
-SHA256 (lldb-11.0.0.src.tar.xz) = 8570c09f57399e21e0eea0dcd66ae0231d47eafc7a04d6fe5c4951b13c4d2c72
-SIZE (lldb-11.0.0.src.tar.xz) = 9740312
-SHA256 (openmp-11.0.0.src.tar.xz) = 2d704df8ca67b77d6d94ebf79621b0f773d5648963dd19e0f78efef4404b684c
-SIZE (openmp-11.0.0.src.tar.xz) = 975108
+TIMESTAMP = 1610040988
+SHA256 (llvm-11.0.1.src.tar.xz) = ccd87c254b6aebc5077e4e6977d08d4be888e7eb672c6630a26a15d58b59b528
+SIZE (llvm-11.0.1.src.tar.xz) = 38914796
+SHA256 (clang-11.0.1.src.tar.xz) = 73f572c2eefc5a155e01bcd84815751d722a4d3925f53c144acfb93eeb274b4d
+SIZE (clang-11.0.1.src.tar.xz) = 14849680
+SHA256 (compiler-rt-11.0.1.src.tar.xz) = 087be3f1116e861cd969c9b0b0903c27028b52eaf45157276f50a9c2500687fc
+SIZE (compiler-rt-11.0.1.src.tar.xz) = 2136216
+SHA256 (clang-tools-extra-11.0.1.src.tar.xz) = 2ca211dd8cc396a919709a9bc35af11b7d425df0c608d85ba6629242893516c9
+SIZE (clang-tools-extra-11.0.1.src.tar.xz) = 1498852
+SHA256 (lld-11.0.1.src.tar.xz) = 60ba0da01a391078dcc437fee629f3bf7e30e06467a3a060b4a2a3aa661308b7
+SIZE (lld-11.0.1.src.tar.xz) = 1237040
+SHA256 (lldb-11.0.1.src.tar.xz) = e8d38917d079356fc1200676dfb370e16f3ee9cbdd092dd31e59d080ac5ef2fb
+SIZE (lldb-11.0.1.src.tar.xz) = 9706328
+SHA256 (openmp-11.0.1.src.tar.xz) = 4d15a21b90e7de2f01296503f6e4b16c50197fbe9c82e7e81f9c07e28bd82ca7
+SIZE (openmp-11.0.1.src.tar.xz) = 971332

Modified: head/devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
==============================================================================
--- head/devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h	Fri Jan  8 22:14:43 2021	(r560813)
+++ head/devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h	Fri Jan  8 22:25:56 2021	(r560814)
@@ -1,5 +1,5 @@
---- ../compiler-rt-11.0.0.src/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
-+++ ../compiler-rt-11.0.0.src/lib/sanitizer_common/sanitizer_platform_interceptors.h
+--- ../compiler-rt-11.0.1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
++++ ../compiler-rt-11.0.1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h
 @@ -597,7 +597,7 @@
  #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD
  #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101082225.108MPuio061218>