diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2024-02-16 19:40:34 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-17 18:19:19 +0000 |
commit | ee3541ca8a9cfd2e2fc24e7fa042716f78efff91 (patch) | |
tree | 470a739de8c5195a6c2f6429d5f1cd71ccbc015a /meta/recipes-support | |
parent | e61afce99efd425cabd7a89fdf998eab2ceaab21 (diff) | |
download | poky-ee3541ca8a9cfd2e2fc24e7fa042716f78efff91.tar.gz |
libcap-ng: fix build with swig 4.2.0
Backport an upstream patch to remove Python exception handler which is
deprecated and also removed from swig.
https://github.com/swig/swig/commit/736c052d7de3685be9d5c4aecee6b36273e8c319
(From OE-Core rev: 970db363039ab1c9d3cc5eb33eb834865ac340c4)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch | 32 | ||||
-rw-r--r-- | meta/recipes-support/libcap-ng/libcap-ng.inc | 4 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch b/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch new file mode 100644 index 0000000000..fb424fe725 --- /dev/null +++ b/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 355eada2d20886287cffc16e304087dd6f66ae37 Mon Sep 17 00:00:00 2001 | ||
2 | From: Steve Grubb <ausearch.1@gmail.com> | ||
3 | Date: Thu, 4 Jan 2024 15:06:29 -0500 | ||
4 | Subject: [PATCH] Remove python global exception handler since its deprecated | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/stevegrubb/libcap-ng/commit/30453b6553948cd05c438f9f509013e3bb84f25b] | ||
7 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
8 | --- | ||
9 | bindings/src/capng_swig.i | 7 ------- | ||
10 | 1 file changed, 7 deletions(-) | ||
11 | |||
12 | diff --git a/bindings/src/capng_swig.i b/bindings/src/capng_swig.i | ||
13 | index fcdaf18..fa85e13 100644 | ||
14 | --- a/bindings/src/capng_swig.i | ||
15 | +++ b/bindings/src/capng_swig.i | ||
16 | @@ -30,13 +30,6 @@ | ||
17 | |||
18 | %varargs(16, signed capability = 0) capng_updatev; | ||
19 | |||
20 | -%except(python) { | ||
21 | - $action | ||
22 | - if (result < 0) { | ||
23 | - PyErr_SetFromErrno(PyExc_OSError); | ||
24 | - return NULL; | ||
25 | - } | ||
26 | -} | ||
27 | #endif | ||
28 | |||
29 | %define __signed__ | ||
30 | -- | ||
31 | 2.43.2 | ||
32 | |||
diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc index a6b5dcf452..845b7c2f0a 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc | |||
@@ -7,7 +7,9 @@ LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
8 | file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" | 8 | file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" |
9 | 9 | ||
10 | SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz" | 10 | SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ |
11 | file://fix-issues-with-swig-4-2.patch \ | ||
12 | " | ||
11 | 13 | ||
12 | SRC_URI[sha256sum] = "68581d3b38e7553cb6f6ddf7813b1fc99e52856f21421f7b477ce5abd2605a8a" | 14 | SRC_URI[sha256sum] = "68581d3b38e7553cb6f6ddf7813b1fc99e52856f21421f7b477ce5abd2605a8a" |
13 | 15 | ||