a71-pmos/pmaports-a71
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

u-boot-librem5: fix build with modern SWIG (MR 5893)

Browse Source
This commit is contained in:
Oliver Smith 2024-12-10 08:37:32 +01:00
parent 99a17c5b0f
commit 4de559cf50
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
device/.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch Normal file
View File

@ -0,0 +1,51 @@
From 4cbffcd4f146ccceafccd9fa9d522640d1f0f519 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Tue, 10 Dec 2024 08:33:54 +0100
Subject: [PATCH] libfdt.i_shipped: use SWIG_AppendOutput
Fix this build error with modern SWIG:
scripts/dtc/pylibfdt/libfdt_wrap.c: In function '_wrap_fdt_next_node':
scripts/dtc/pylibfdt/libfdt_wrap.c:5578:17: error: too few arguments to function 'SWIG_Python_AppendOutput'
5578 | resultobj = SWIG_Python_AppendOutput(resultobj, val);
Patch is based on:
https://github.com/dgibson/dtc/pull/154
---
scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
index 27c29ea260..3bbbfb3c9f 100644
--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
+++ b/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);
}
}
--
2.47.1

1
device/main/u-boot-librem5/0003-libfdt.i_shipped-use-SWIG_AppendOutput.patch Symbolic link
View File

@ -0,0 +1 @@
../../.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch

4
device/main/u-boot-librem5/APKBUILD
View File

@ -4,7 +4,7 @@
# Contributor: Clayton Craft <clayton@craftyguy.net> # Contributor: Clayton Craft <clayton@craftyguy.net>
pkgname=u-boot-librem5 pkgname=u-boot-librem5
pkgver=2022.10 pkgver=2022.10
pkgrel=2 pkgrel=3
# 'upstream/librem5' branch in uboot repo # 'upstream/librem5' branch in uboot repo
_commit="c4960dade272da9d6a7f53f6956d4d6747d573e9" _commit="c4960dade272da9d6a7f53f6956d4d6747d573e9"
# 'librem5' branch in atf repo # 'librem5' branch in atf repo
@ -35,6 +35,7 @@ source="
update-u-boot update-u-boot
0001-librem5-enable-console-on-UART4.patch 0001-librem5-enable-console-on-UART4.patch
0002-libfdt-Fix-invalid-version-warning.patch 0002-libfdt-Fix-invalid-version-warning.patch
0003-libfdt.i_shipped-use-SWIG_AppendOutput.patch
" "
install="$pkgname.post-upgrade" install="$pkgname.post-upgrade"
install="$pkgname.post-upgrade $pkgname-devkit.post-upgrade" install="$pkgname.post-upgrade $pkgname-devkit.post-upgrade"
@ -119,4 +120,5 @@ d35e46b94ebf50a7ffcedf824f19bca5195cbf0bbcee1dd6cea115f090a3a963975e6eaaa33eac62
e46a863001872943301f9712e45797553ce52d8b0c3e63dba7beb1a54b857e8f3a715863b84cd7ab784f039f82d29a2b19b581891d11a84c342b1570e5ccfed3 update-u-boot e46a863001872943301f9712e45797553ce52d8b0c3e63dba7beb1a54b857e8f3a715863b84cd7ab784f039f82d29a2b19b581891d11a84c342b1570e5ccfed3 update-u-boot
f5c8a49bda189639386f2367418ab492f10e0e3c0c3f4ca078c461c0cf4427e113a90f49c37f01ef4db0a6e0f55d4f0a6346777e291918866821e659077e374a 0001-librem5-enable-console-on-UART4.patch f5c8a49bda189639386f2367418ab492f10e0e3c0c3f4ca078c461c0cf4427e113a90f49c37f01ef4db0a6e0f55d4f0a6346777e291918866821e659077e374a 0001-librem5-enable-console-on-UART4.patch
895a6e7794257a2b13ecd4e10426d1539338b3ed2000df99ec94c7a319154895794a60aeae2946f4ca32d37095e4142ebbdb049bbccf70f257e77e977b1cedf8 0002-libfdt-Fix-invalid-version-warning.patch 895a6e7794257a2b13ecd4e10426d1539338b3ed2000df99ec94c7a319154895794a60aeae2946f4ca32d37095e4142ebbdb049bbccf70f257e77e977b1cedf8 0002-libfdt-Fix-invalid-version-warning.patch
016ef30dbbb1021dad4f58eeda3f5a5e89ff3a76dbc69e8e4cf6a3fc3983aef998cfe1087abb4b21bb2f859bd5cffe26c1da42d13f1c3d2e3c053c399f38720b 0003-libfdt.i_shipped-use-SWIG_AppendOutput.patch
" "