From nobody Tue Apr 18 21:50:44 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q1HfY0kKmz45kCC; Tue, 18 Apr 2023 21:50:45 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q1HfX5gqJz45cd; Tue, 18 Apr 2023 21:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S3j9S/6c1Ktd8txupxmj0vcbtUkI7uWDXQtOrW6eX3g=; b=L0u2afvipz2P8uCAC1RYJNFE5QaWrn9iEkIXft5cnjmnA96WRIlEgWdDUUnV3gr5Rb80zs AqHaazGuvQw8dTQrgTXv8oQILWezgIvEJV06HjhBCVOLfzT3+Di5HnTDi8fW5areh56e1A UDxKAPd3IiXQOJWuONLvsJR6yTD3+Y1VAgumb5lrT3ejEjGLlkJ/8jUQchNiR/Id1bB6zO SKIs+dkCCha3woA5B0nUBIkcf4gfoKlYH1DYz33ae7dwkK/iWM3zOpP99L7lmst0W6S1Qg h8JnBrVe84Y/se/SLclkduzCTP7q9DoGFVqpuwVF/CNXoc0vJt/1yp7D3KVpQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S3j9S/6c1Ktd8txupxmj0vcbtUkI7uWDXQtOrW6eX3g=; b=FzKPDz6AUYBgssDrLhlp3DouMnrPICbk02e5rcJy49HHlorq35tlzifrmxdsPP3DfPL+Y/ AI87SNsuz/yPbXcg9NidLJyVsvwrydYArRJ6Ra4czPu/iVgSdCrBJ7C7p8AkGm8iPr40/r CdQzeesuSMqDDwIfH8nr1K7VhSIaJWQSkQ7AN4Z7fOS4MFrf65ANFgK01LPzJ/lcor5T+I 6xYscBStY+sXYUj45c+KY9GI+Q5RftrXUz9IoHRQ8bc9RD3oBOlA/J9jfmsOIl2VIS48XU r2smY3FLH8veeD+3SaBTjjWPhQ4xfhHzMyn1a0JbFvo2RzOreBR1bJxSQJRukg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681854644; a=rsa-sha256; cv=none; b=aIWs/JW0s19OBldSk9NLSKZpVYL4ubYcspW34Cmeic3/Zd8TFiZR6beWYOzJGub/lSn9FW vKXNx3a3+FElpQbNmVUw+UmO0ddAWdga8J9oGBIXnpr0OpbN0tkGOrT4oQ34s1bpmW09Sj l5qYK/k4BCsP51NJNL+S+TUFhzY7CXJws3KfUBqqnTb4cTtFDbA7J0H/FqfhX7Jv5F6P0t cAJa0XYesvg8pitFDlrmyIiOf13yu7GeXFWCVG9RI6/jn8kt8NeqzYvBSCRCYTqJ/Vrv1y EZTFQlcW0uGO/GTf15S7X+DXLl+LPMtQJ7EwAY5msB++Tsi9Pt5q7VkmeoXulA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q1HfX4bPWzTLC; Tue, 18 Apr 2023 21:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ILoiCp054643; Tue, 18 Apr 2023 21:50:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ILoi0U054642; Tue, 18 Apr 2023 21:50:44 GMT (envelope-from git) Date: Tue, 18 Apr 2023 21:50:44 GMT Message-Id: <202304182150.33ILoi0U054642@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: dc665642e86a - main - devel/llvm10: Use swig40 instead of swig List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc665642e86a912ccec9307e46cfb08ae0d9f00a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc665642e86a912ccec9307e46cfb08ae0d9f00a commit dc665642e86a912ccec9307e46cfb08ae0d9f00a Author: Po-Chuan Hsieh AuthorDate: 2023-04-18 21:39:16 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-04-18 21:39:16 +0000 devel/llvm10: Use swig40 instead of swig Some issues for swig 4.1.1 has been fixed in patch-swig. However, it still does not build successfully, Therefore, use swig40 instead of swig for now. PR: 270720 --- devel/llvm10/Makefile | 3 +- devel/llvm10/files/patch-swig | 90 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile index c5537d2c14c9..ec9b22dbb8b5 100644 --- a/devel/llvm10/Makefile +++ b/devel/llvm10/Makefile @@ -136,7 +136,8 @@ LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python:3.6+ LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} -LLDB_BUILD_DEPENDS= swig:devel/swig +LLDB_BINARY_ALIAS= swig=swig40 +LLDB_BUILD_DEPENDS= swig40:devel/swig40 LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ -DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \ -DCURSES_INCLUDE_PATH=/usr/include \ diff --git a/devel/llvm10/files/patch-swig b/devel/llvm10/files/patch-swig new file mode 100644 index 000000000000..e9c3ec903903 --- /dev/null +++ b/devel/llvm10/files/patch-swig @@ -0,0 +1,90 @@ +--- tools/lldb/bindings/CMakeLists.txt.orig 2020-07-07 16:21:37 UTC ++++ tools/lldb/bindings/CMakeLists.txt +@@ -26,8 +26,6 @@ set(SWIG_COMMON_FLAGS + -features autodoc + -I${LLDB_SOURCE_DIR}/include + -I${CMAKE_CURRENT_SOURCE_DIR} +- -D__STDC_LIMIT_MACROS +- -D__STDC_CONSTANT_MACROS + ${DARWIN_EXTRAS} + -outdir ${CMAKE_CURRENT_BINARY_DIR} + ) +--- tools/lldb/bindings/interface/SBAddress.i.orig 2020-07-07 16:21:37 UTC ++++ tools/lldb/bindings/interface/SBAddress.i +@@ -17,9 +17,10 @@ libraries, bundles, frameworks) being loaded at differ + addresses than the addresses found in the object file that + represents them on disk. There are currently two types of addresses + for a section: +- o file addresses +- o load addresses + ++* file addresses ++* load addresses ++ + File addresses represents the virtual addresses that are in the 'on + disk' object files. These virtual addresses are converted to be + relative to unique sections scoped to the object file so that +@@ -108,18 +109,17 @@ class SBAddress (public) + An address might refer to code or data from an existing module, or it + might refer to something on the stack or heap. The following functions + will only return valid values if the address has been resolved to a code +- or data address using 'void SBAddress::SetLoadAddress(...)' or +- 'lldb::SBAddress SBTarget::ResolveLoadAddress (...)'.") GetSymbolContext; ++ or data address using :py:class:`SBAddress.SetLoadAddress' or ++ :py:class:`SBTarget.ResolveLoadAddress`.") GetSymbolContext; + lldb::SBSymbolContext + GetSymbolContext (uint32_t resolve_scope); + + %feature("docstring", " + GetModule() and the following grab individual objects for a given address and + are less efficient if you want more than one symbol related objects. +- Use one of the following when you want multiple debug symbol related +- objects for an address: +- lldb::SBSymbolContext SBAddress::GetSymbolContext (uint32_t resolve_scope); +- lldb::SBSymbolContext SBTarget::ResolveSymbolContextForAddress (const SBAddress &addr, uint32_t resolve_scope); ++ Use :py:class:`SBAddress.GetSymbolContext` or ++ :py:class:`SBTarget.ResolveSymbolContextForAddress` when you want multiple ++ debug symbol related objects for an address. + One or more bits from the SymbolContextItem enumerations can be logically + OR'ed together to more efficiently retrieve multiple symbol objects.") GetModule; + lldb::SBModule +--- tools/lldb/bindings/interface/SBValueList.i.orig 2020-07-07 16:21:37 UTC ++++ tools/lldb/bindings/interface/SBValueList.i +@@ -102,7 +102,6 @@ class SBValueList (public) + GetFirstValueByName (const char* name) const; + + %extend { +- %nothreadallow; + std::string lldb::SBValueList::__str__ (){ + lldb::SBStream description; + const size_t n = $self->GetSize(); +@@ -121,7 +120,6 @@ class SBValueList (public) + --desc_len; + return std::string(desc, desc_len); + } +- %clearnothreadallow; + } + + #ifdef SWIGPYTHON +--- tools/lldb/bindings/interfaces.swig.orig 2020-07-07 16:21:37 UTC ++++ tools/lldb/bindings/interfaces.swig +@@ -1,8 +1,5 @@ + /* Various liblldb typedefs that SWIG needs to know about. */ + #define __extension__ /* Undefine GCC keyword to make Swig happy when processing glibc's stdint.h. */ +-/* The ISO C99 standard specifies that in C++ implementations limit macros such +- as INT32_MAX should only be defined if __STDC_LIMIT_MACROS is. */ +-#define __STDC_LIMIT_MACROS + %include "stdint.i" + + %include "lldb/lldb-defines.h" +--- tools/lldb/bindings/python/python-typemaps.swig.orig 2020-07-07 16:21:37 UTC ++++ tools/lldb/bindings/python/python-typemaps.swig +@@ -445,7 +445,7 @@ bool SetNumberFromPyObject(double &number, PyO + + %typemap(out) lldb::FileSP { + $result = nullptr; +- lldb::FileSP &sp = $1; ++ const lldb::FileSP &sp = $1; + if (sp) { + PythonFile pyfile = unwrapOrSetPythonException(PythonFile::FromFile(*sp)); + if (!pyfile.IsValid())