diff options
author | Guocai He <guocai.he.cn@windriver.com> | 2024-08-22 09:16:21 +0800 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-08-28 06:49:22 -0700 |
commit | 2b5ca6638e1a490a1230bccdb34a95b43f3d253e (patch) | |
tree | 7ce6cd7bf9bb845b6f9a6d4fc9c3e686a7eb2046 | |
parent | 2640cecd2f4d45786bb9faed61858a5fd8cf93e8 (diff) | |
download | poky-2b5ca6638e1a490a1230bccdb34a95b43f3d253e.tar.gz |
libsoup: fix compile error on centos7
Backport a patch [1] to fix the below build failure.
FAILED: libsoup/libsoup-2.4.so.1.11.0.p/soup-address.c.o
In file included from /usr/include/glib-2.0/gio/gnetworking.h:40,
from ../libsoup-2.72.0/libsoup/soup-address.c:14:
/usr/include/resolv.h:75:15: error: unknown type name ‘u_char’
const u_char **__query,
^~~~~~
[1] https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c
(From OE-Core rev: 963085afced737863cf4ff8515a1cf08365d5d87)
Signed-off-by: Guocai He <guocai.he.cn@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4/0001-meson.build-set-c_std-to-gnu99.patch | 44 | ||||
-rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb | 4 |
2 files changed, 47 insertions, 1 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/0001-meson.build-set-c_std-to-gnu99.patch b/meta/recipes-support/libsoup/libsoup-2.4/0001-meson.build-set-c_std-to-gnu99.patch new file mode 100644 index 0000000000..4a7d189515 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4/0001-meson.build-set-c_std-to-gnu99.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From c41784deb1d4a923007ffe14cfa676f785808f45 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabrice Fontaine <fontaine.fabrice@gmail.com> | ||
3 | Date: Wed, 21 Aug 2024 06:48:32 +0000 | ||
4 | Subject: [PATCH] meson.build: set c_std to gnu99 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Set c_std to gnu99 to avoid the following build failure with gcc 4.8: | ||
10 | |||
11 | In file included from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/resolv.h:65:0, | ||
12 | from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/gio/gnetworking.h:40, | ||
13 | from ../libsoup/soup-address.c:14: | ||
14 | /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/arpa/nameser.h:115:2: error: unknown type name 'u_char' | ||
15 | const u_char *_msg, *_eom; | ||
16 | ^ | ||
17 | |||
18 | Fixes: | ||
19 | - http://autobuild.buildroot.org/results/56b9cb987e25b99d6fed16c537552f47c3376f21 | ||
20 | |||
21 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c] | ||
22 | |||
23 | Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> | ||
24 | Signed-off-by: guocai <guocai.he.cn@windriver.com> | ||
25 | --- | ||
26 | meson.build | 2 +- | ||
27 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
28 | |||
29 | diff --git a/meson.build b/meson.build | ||
30 | index 3cc56fb..506c5a4 100644 | ||
31 | --- a/meson.build | ||
32 | +++ b/meson.build | ||
33 | @@ -2,7 +2,7 @@ project('libsoup', 'c', | ||
34 | version: '2.74.2', | ||
35 | meson_version : '>=0.50', | ||
36 | license : 'LGPL2', | ||
37 | - default_options : 'c_std=c99') | ||
38 | + default_options : 'c_std=gnu99') | ||
39 | |||
40 | gnome = import('gnome') | ||
41 | |||
42 | -- | ||
43 | 2.35.5 | ||
44 | |||
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb index 6ff393c9a3..be286e1849 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb | |||
@@ -11,7 +11,9 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl" | |||
11 | 11 | ||
12 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 12 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
13 | 13 | ||
14 | SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" | 14 | SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ |
15 | file://0001-meson.build-set-c_std-to-gnu99.patch \ | ||
16 | " | ||
15 | SRC_URI[sha256sum] = "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159" | 17 | SRC_URI[sha256sum] = "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159" |
16 | 18 | ||
17 | CVE_PRODUCT = "libsoup" | 19 | CVE_PRODUCT = "libsoup" |