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] 5c3d431bdb

(From OE-Core rev: 963085afced737863cf4ff8515a1cf08365d5d87)

Signed-off-by: Guocai He <guocai.he.cn@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Guocai He
2024-08-22 09:16:21 +08:00
committed by Steve Sakoman
parent 2640cecd2f
commit 2b5ca6638e
2 changed files with 47 additions and 1 deletions

View File

@@ -0,0 +1,44 @@
From c41784deb1d4a923007ffe14cfa676f785808f45 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed, 21 Aug 2024 06:48:32 +0000
Subject: [PATCH] meson.build: set c_std to gnu99
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Set c_std to gnu99 to avoid the following build failure with gcc 4.8:
In file included from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/resolv.h:65:0,
from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/gio/gnetworking.h:40,
from ../libsoup/soup-address.c: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'
const u_char *_msg, *_eom;
^
Fixes:
- http://autobuild.buildroot.org/results/56b9cb987e25b99d6fed16c537552f47c3376f21
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: guocai <guocai.he.cn@windriver.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 3cc56fb..506c5a4 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project('libsoup', 'c',
version: '2.74.2',
meson_version : '>=0.50',
license : 'LGPL2',
- default_options : 'c_std=c99')
+ default_options : 'c_std=gnu99')
gnome = import('gnome')
--
2.35.5

View File

@@ -11,7 +11,9 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl"
SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
file://0001-meson.build-set-c_std-to-gnu99.patch \
"
SRC_URI[sha256sum] = "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159"
CVE_PRODUCT = "libsoup"