From owner-svn-ports-head@freebsd.org Mon Jan 11 23:46:57 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 15C914E9EE6; Mon, 11 Jan 2021 23:46:57 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DF9NK06n6z3MPG; Mon, 11 Jan 2021 23:46:57 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EAFEC23611; Mon, 11 Jan 2021 23:46:56 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10BNkuO5092328; Mon, 11 Jan 2021 23:46:56 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10BNkuCt092327; Mon, 11 Jan 2021 23:46:56 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202101112346.10BNkuCt092327@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Mon, 11 Jan 2021 23:46:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561287 - head/devel/llvm10 X-SVN-Group: ports-head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/devel/llvm10 X-SVN-Commit-Revision: 561287 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2021 23:46:57 -0000 Author: brooks Date: Mon Jan 11 23:46:56 2021 New Revision: 561287 URL: https://svnweb.freebsd.org/changeset/ports/561287 Log: llvm10: Avoid untracked ncurses depend 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 MFH: 2021Q1 Modified: head/devel/llvm10/Makefile Modified: head/devel/llvm10/Makefile ============================================================================== --- head/devel/llvm10/Makefile Mon Jan 11 23:39:00 2021 (r561286) +++ head/devel/llvm10/Makefile Mon Jan 11 23:46:56 2021 (r561287) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 10.0.1 -PORTREVISION= 4 +PORTREVISION= 5 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} @@ -58,6 +58,8 @@ 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}${PYTHON_ABIVER}.so +# 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. @@ -133,7 +135,12 @@ LLD_LINK_DESC= Link ld.lld as ld to clang uses it LLD_LINK_IMPLIES= LLD LLDB_BUILD_DEPENDS= swig:devel/swig 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