Index | Thread | Search

From:
Stuart Cassoff <exokoide@yahoo.ca>
Subject:
sysutils/u-boot: build with SWIG < 4.40 and SWIG >= 4.40
To:
OpenBSD Ports <ports@openbsd.org>
Date:
Sun, 25 Jan 2026 10:26:34 -0500

Download raw body.

Thread
  • Stuart Cassoff:

    sysutils/u-boot: build with SWIG < 4.40 and SWIG >= 4.40

arm and sun50i were built with SWIG 4.4.1 on i386, fwiw.
Probably all fine; it's a simple change.
Same patch for all affected ports.

Patches only needed for pre-2025.7.
I imagine an update is not straightforward,
because it would have to be tested with actual hardware.



diff -Nurp /usr/ports/sysutils/u-boot/arm/Makefile ./arm/Makefile
--- /usr/ports/sysutils/u-boot/arm/Makefile	Thu Apr 11 08:39:18 2024
+++ ./arm/Makefile	Sun Jan 25 07:30:10 2026
@@ -1,5 +1,5 @@
 VERSION=	2021.10
-REVISION=	9
+REVISION=	10
 
 SOC=		arm
 
diff -Nurp /usr/ports/sysutils/u-boot/arm/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped ./arm/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped
--- /usr/ports/sysutils/u-boot/arm/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped	Wed Dec 31 19:00:00 1969
+++ ./arm/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped	Fri Jan  2 09:10:14 2026
@@ -0,0 +1,33 @@
+https://source.denx.de/u-boot/u-boot/-/commit/a63456b9191fae2fe49f4b121e025792022e3950
+
+
+Index: scripts/dtc/pylibfdt/libfdt.i_shipped
+--- scripts/dtc/pylibfdt/libfdt.i_shipped.orig
++++ scripts/dtc/pylibfdt/libfdt.i_shipped
+@@ -1033,7 +1033,7 @@ typedef uint32_t fdt32_t;
+ 			fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
+ 		buff = PyByteArray_FromStringAndSize(
+ 			(const char *)($1 + 1), fdt32_to_cpu($1->len));
+-		resultobj = SWIG_Python_AppendOutput(resultobj, buff);
++		resultobj = SWIG_AppendOutput(resultobj, buff);
+ 	}
+ }
+ 
+@@ -1072,7 +1072,7 @@ typedef uint32_t fdt32_t;
+ 
+ %typemap(argout) int *depth {
+         PyObject *val = Py_BuildValue("i", *arg$argnum);
+-        resultobj = SWIG_Python_AppendOutput(resultobj, val);
++        resultobj = SWIG_AppendOutput(resultobj, val);
+ }
+ 
+ %apply int *depth { int *depth };
+@@ -1088,7 +1088,7 @@ typedef uint32_t fdt32_t;
+            if (PyTuple_GET_SIZE(resultobj) == 0)
+               resultobj = val;
+            else
+-              resultobj = SWIG_Python_AppendOutput(resultobj, val);
++              resultobj = SWIG_AppendOutput(resultobj, val);
+         }
+ }
+ 



diff -Nurp /usr/ports/sysutils/u-boot/riscv64/Makefile ./riscv64/Makefile
--- /usr/ports/sysutils/u-boot/riscv64/Makefile	Fri Mar  1 06:49:27 2024
+++ ./riscv64/Makefile	Sun Jan 25 07:30:21 2026
@@ -1,5 +1,5 @@
 VERSION=	2021.10
-REVISION=	8
+REVISION=	9
 
 SOC=		riscv64
 
diff -Nurp /usr/ports/sysutils/u-boot/riscv64/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped ./riscv64/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped
--- /usr/ports/sysutils/u-boot/riscv64/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped	Wed Dec 31 19:00:00 1969
+++ ./riscv64/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped	Fri Jan  2 09:10:54 2026
@@ -0,0 +1,32 @@
+https://source.denx.de/u-boot/u-boot/-/commit/a63456b9191fae2fe49f4b121e025792022e3950
+
+Index: scripts/dtc/pylibfdt/libfdt.i_shipped
+--- scripts/dtc/pylibfdt/libfdt.i_shipped.orig
++++ scripts/dtc/pylibfdt/libfdt.i_shipped
+@@ -1033,7 +1033,7 @@ typedef uint32_t fdt32_t;
+ 			fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
+ 		buff = PyByteArray_FromStringAndSize(
+ 			(const char *)($1 + 1), fdt32_to_cpu($1->len));
+-		resultobj = SWIG_Python_AppendOutput(resultobj, buff);
++		resultobj = SWIG_AppendOutput(resultobj, buff);
+ 	}
+ }
+ 
+@@ -1072,7 +1072,7 @@ typedef uint32_t fdt32_t;
+ 
+ %typemap(argout) int *depth {
+         PyObject *val = Py_BuildValue("i", *arg$argnum);
+-        resultobj = SWIG_Python_AppendOutput(resultobj, val);
++        resultobj = SWIG_AppendOutput(resultobj, val);
+ }
+ 
+ %apply int *depth { int *depth };
+@@ -1088,7 +1088,7 @@ typedef uint32_t fdt32_t;
+            if (PyTuple_GET_SIZE(resultobj) == 0)
+               resultobj = val;
+            else
+-              resultobj = SWIG_Python_AppendOutput(resultobj, val);
++              resultobj = SWIG_AppendOutput(resultobj, val);
+         }
+ }
+ 



diff -Nurp /usr/ports/sysutils/u-boot/sun50i/Makefile ./sun50i/Makefile
--- /usr/ports/sysutils/u-boot/sun50i/Makefile	Mon Dec 23 04:13:00 2024
+++ ./sun50i/Makefile	Sun Jan 25 07:30:40 2026
@@ -1,4 +1,5 @@
 VERSION=	2024.01
+REVISION=	0
 
 SOC=		sun50i
 
diff -Nurp /usr/ports/sysutils/u-boot/sun50i/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped ./sun50i/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped
--- /usr/ports/sysutils/u-boot/sun50i/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped	Wed Dec 31 19:00:00 1969
+++ ./sun50i/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped	Fri Jan  2 18:28:24 2026
@@ -0,0 +1,33 @@
+https://source.denx.de/u-boot/u-boot/-/commit/a63456b9191fae2fe49f4b121e025792022e3950
+
+
+Index: scripts/dtc/pylibfdt/libfdt.i_shipped
+--- scripts/dtc/pylibfdt/libfdt.i_shipped.orig
++++ scripts/dtc/pylibfdt/libfdt.i_shipped
+@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t;
+ 			fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
+ 		buff = PyByteArray_FromStringAndSize(
+ 			(const char *)($1 + 1), fdt32_to_cpu($1->len));
+-		resultobj = SWIG_Python_AppendOutput(resultobj, buff);
++		resultobj = SWIG_AppendOutput(resultobj, buff);
+ 	}
+ }
+ 
+@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t;
+ 
+ %typemap(argout) int *depth {
+         PyObject *val = Py_BuildValue("i", *arg$argnum);
+-        resultobj = SWIG_Python_AppendOutput(resultobj, val);
++        resultobj = SWIG_AppendOutput(resultobj, val);
+ }
+ 
+ %apply int *depth { int *depth };
+@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t;
+            if (PyTuple_GET_SIZE(resultobj) == 0)
+               resultobj = val;
+            else
+-              resultobj = SWIG_Python_AppendOutput(resultobj, val);
++              resultobj = SWIG_AppendOutput(resultobj, val);
+         }
+ }
+ 



diff -Nurp /usr/ports/sysutils/u-boot/sunxi/Makefile ./sunxi/Makefile
--- /usr/ports/sysutils/u-boot/sunxi/Makefile	Tue Apr  9 08:59:44 2024
+++ ./sunxi/Makefile	Sun Jan 25 07:31:01 2026
@@ -1,4 +1,5 @@
 VERSION=	2024.01
+REVISION=	0
 
 SOC=		sunxi
 
diff -Nurp /usr/ports/sysutils/u-boot/sunxi/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped ./sunxi/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped
--- /usr/ports/sysutils/u-boot/sunxi/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped	Wed Dec 31 19:00:00 1969
+++ ./sunxi/patches/patch-scripts_dtc_pylibfdt_libfdt_i_shipped	Fri Jan  2 22:47:53 2026
@@ -0,0 +1,33 @@
+https://source.denx.de/u-boot/u-boot/-/commit/a63456b9191fae2fe49f4b121e025792022e3950
+
+
+Index: scripts/dtc/pylibfdt/libfdt.i_shipped
+--- scripts/dtc/pylibfdt/libfdt.i_shipped.orig
++++ scripts/dtc/pylibfdt/libfdt.i_shipped
+@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t;
+ 			fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
+ 		buff = PyByteArray_FromStringAndSize(
+ 			(const char *)($1 + 1), fdt32_to_cpu($1->len));
+-		resultobj = SWIG_Python_AppendOutput(resultobj, buff);
++		resultobj = SWIG_AppendOutput(resultobj, buff);
+ 	}
+ }
+ 
+@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t;
+ 
+ %typemap(argout) int *depth {
+         PyObject *val = Py_BuildValue("i", *arg$argnum);
+-        resultobj = SWIG_Python_AppendOutput(resultobj, val);
++        resultobj = SWIG_AppendOutput(resultobj, val);
+ }
+ 
+ %apply int *depth { int *depth };
+@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t;
+            if (PyTuple_GET_SIZE(resultobj) == 0)
+               resultobj = val;
+            else
+-              resultobj = SWIG_Python_AppendOutput(resultobj, val);
++              resultobj = SWIG_AppendOutput(resultobj, val);
+         }
+ }
+