Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Apr 2023 21:50:49 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6abba1c915b7 - main - devel/llvm14: Fix build with swig 4.1.1
Message-ID:  <202304182150.33ILon1G054725@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6abba1c915b7ec4f98916d8e3e1203611be39f7e

commit 6abba1c915b7ec4f98916d8e3e1203611be39f7e
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-04-18 21:39:19 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-04-18 21:39:19 +0000

    devel/llvm14: Fix build with swig 4.1.1
    
    PR:             270720
---
 devel/llvm14/files/patch-swig | 62 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/devel/llvm14/files/patch-swig b/devel/llvm14/files/patch-swig
new file mode 100644
index 000000000000..310efab9a63e
--- /dev/null
+++ b/devel/llvm14/files/patch-swig
@@ -0,0 +1,62 @@
+--- lldb/bindings/CMakeLists.txt.orig	2022-06-22 16:46:24 UTC
++++ 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}
+ )
+ 
+--- lldb/bindings/interface/SBValueList.i.orig	2022-06-22 16:46:24 UTC
++++ lldb/bindings/interface/SBValueList.i
+@@ -103,7 +103,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();
+@@ -122,7 +121,6 @@ class SBValueList (public)
+                --desc_len;
+            return std::string(desc, desc_len);
+        }
+-       %clearnothreadallow;
+     }
+ 
+ #ifdef SWIGPYTHON
+--- lldb/bindings/interfaces.swig.orig	2022-06-22 16:46:24 UTC
++++ 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"
+--- lldb/bindings/lua/lua-typemaps.swig.orig	2022-06-22 16:46:24 UTC
++++ lldb/bindings/lua/lua-typemaps.swig
+@@ -247,7 +247,7 @@ LLDB_NUMBER_TYPEMAP(enum SWIGTYPE);
+ // Typemap for file handles (e.g. used in SBDebugger::GetOutputFileHandle)
+ 
+ %typemap(out) lldb::FileSP {
+-  lldb::FileSP &sp = $1;
++  const lldb::FileSP &sp = $1;
+   if (sp && sp->IsValid()) {
+     luaL_Stream *p = (luaL_Stream *)lua_newuserdata(L, sizeof(luaL_Stream));
+     p->closef = &LLDBSwigLuaCloseFileHandle;
+--- lldb/bindings/python/python-typemaps.swig.orig	2022-06-22 16:46:24 UTC
++++ lldb/bindings/python/python-typemaps.swig
+@@ -435,7 +435,7 @@ template <> bool SetNumberFromPyObject<double>(double 
+ 
+ %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())



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