From patchwork Thu Aug 22 01:16:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: guocai he X-Patchwork-Id: 48069 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F35E0C52D6F for ; Thu, 22 Aug 2024 01:16:57 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.3626.1724289413798065246 for ; Wed, 21 Aug 2024 18:16:56 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=89645d55f0=guocai.he.cn@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 47M1E27n011993 for ; Thu, 22 Aug 2024 01:16:43 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2174.outbound.protection.outlook.com [104.47.55.174]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 412ju6vub9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 22 Aug 2024 01:16:43 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FPXSDUiSMSZUmOWvDtVUR/ErlNTE91R72UzRC/yoXUmjYPn6LJtKKS5yzsKGRZN11Xxc8/LDobcRFS2Ee20KXDBs4sWMeB/aBeJk+bhGaKJOR6WRAmnang2XTjkjkiHm45JJXtGHW3NdsOQ/UqEzWPaZtMhZL/fBQ0/THApWmV650T4eZZgMsEyw8zAJdw/9r92VkTeMh9SfP2/bnWoKlBVAe33+uJAVCpcNmaA1H7V2EQ9fw9bpETWs2lgXEf5h97XoBaQBjHzBNCnxLYXIQcnEfRPiNeIYK0fzXZhURvoXrxm9nbsV0IuHcTSe8JDPgHXWvapbZBAlqHvMaUAX7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=erBdQ1ZNvzptn3x6L/aocx95DaF9SerpuXfQ4jKLpOo=; b=D3UA2lzIalnmC+CdtMEDmNUOmc6QZdzlifcECAOaVftEcqDNloY0VuvSNVqdh8BGAifrfn/RDZ6nXq5mAbQrMcZS0P1xC4m5Lqfca/oDD3LF/xkTB7DyKIwTRUoLNzxnSIRU6k5P3KfPUAu11CIYVziXrtvPKNSQOmITnhNZsURaYktCNGJ5WTbvy25kNXjFnOK/5dgDQoVG2nRcklSM9wEmShuxEgDHql47fLgnQOf2sK0HyMvjcKhLBmxu+Dg2p5/pJG8e4LVn47pn+Ob/+GlU9otti9ZiAAVq5R+Ch4RmIaKsl3llDZAOPzlTeLKkbPVJ6EsQYOyNSUsYedWuQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SN6PR11MB2671.namprd11.prod.outlook.com (2603:10b6:805:60::18) by SA2PR11MB4795.namprd11.prod.outlook.com (2603:10b6:806:118::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.17; Thu, 22 Aug 2024 01:16:40 +0000 Received: from SN6PR11MB2671.namprd11.prod.outlook.com ([fe80::3e06:cc6f:58bb:3326]) by SN6PR11MB2671.namprd11.prod.outlook.com ([fe80::3e06:cc6f:58bb:3326%4]) with mapi id 15.20.7875.019; Thu, 22 Aug 2024 01:16:40 +0000 From: guocai.he.cn@windriver.com To: mingli.yu@windriver.com, openembedded-core@lists.openembedded.org Subject: [meta][kirkstone][PATCH] libsoup: fix compile error on centos7 Date: Thu, 22 Aug 2024 09:16:21 +0800 Message-Id: <20240822011621.2721757-1-guocai.he.cn@windriver.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: TYCP286CA0112.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::7) To SN6PR11MB2671.namprd11.prod.outlook.com (2603:10b6:805:60::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR11MB2671:EE_|SA2PR11MB4795:EE_ X-MS-Office365-Filtering-Correlation-Id: 4ed1d80b-f51c-492c-5862-08dcc24813a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?gXebcEHN175ex2/hfgAt+zPsV0Cza2R?= =?utf-8?q?BuEa/GHY5kouXcVit1bBWemLOqpc2T5r1NdOomPR8oenF73/yJW3dm/WTZQAV2PzB?= =?utf-8?q?p8UaccEJlC4Eq8uPE7/Dw+Hj/wi/YMxtdDk9w7EuYG68fd60mNO/FcJN7uxY8Rllm?= =?utf-8?q?GEuzXOZU3nkmgvzUxZrwU3FYMiZpKfTaNssxdecRFaWARpsVuyjfKTI9OcfxBsC9g?= =?utf-8?q?6Bzh6z49+EHia7DwRB7Sg2bYBwGnKRMvzaNJcsf40dTAAQx92wtTHS6rTaGutxVxC?= =?utf-8?q?8a3NZFPjBiJ2nMbLYJtkfdkEDPpegmOx6ZOXT++IokTJ+r5bSHjNXjnEArKWhY0Sr?= =?utf-8?q?KTe9AJt81Tqv6GcRVgZrIyNtrCRHWSeZ1LbDeLHSTwlQMGP77fVdIc13gXCNXIcK4?= =?utf-8?q?NRDFL81J4wKsJo28X/4wCZjfUaaM1lOdgdRuRASFf8sJrFNjdLSyKW66Px9LzbEhh?= =?utf-8?q?1IF2JbNZHVtWHGIlQn1LnnKVYYQX5v7c+WYZGLBjQlTLNgNkT2/s88Wo0L5N+AMew?= =?utf-8?q?/kJX3UtrMKEdI5qeq4PJfkq/0tHGzRPWW6+XYorgu2q3AymX0hV1H71oJZ9g4tHFx?= =?utf-8?q?pzwfeEp2Bavb1is3d40ZP4RylTtrfCPPeQOIoO2iPD7RwrnNCEQGjGotJQGtenrNG?= =?utf-8?q?sFCQHQ8W+shAcIZFRiaAMIDqD5IZx2DIkh+ug6tMCQldZSlaHvK2RO1/QvjfG/6qW?= =?utf-8?q?vFvCrAdYgBdeYJ6Lgcq5a+GYVSxtBPTe5ccjO/BRFL3+jYynwbfbk/2pMkxzf0bxC?= =?utf-8?q?GsRFnZkd7N4nQXWK9yjDL2h9JC3XW6ZhQ1nKEiL6EeQafTQcnAIct0TJJ+KVU4m9U?= =?utf-8?q?+0r30DuS5pf30ySmmupc1C6u3/9Yby+tlVII0Lm48RCFLzcvI2jhEjd3s3Y8Mdd7w?= =?utf-8?q?Pra7fsXMiFzD/KW6DW5az1Fa2nN1SW9iN3cSQbPBB+cdo0WsSvlDm5XD2Mk2AKcMg?= =?utf-8?q?qM1PsVSbnD58YRq9vJgnZm8Y6nuCZisrbURABDx47uaMGr98K8tk8oTKzRH9oWngV?= =?utf-8?q?Xd2TKVimhl8bl1Xv27CAv4QK8qMezKu6HNJXZDXM9XTgAPKGW35exvbDrgzOQXQss?= =?utf-8?q?tUFEa1ctcbCU7GzGQ3kPCIN8KfZmQqRYl0JCdJbj8Ao3r+jhSyj/iqIc0s46bsGEA?= =?utf-8?q?AvnzmQcFfvEktiIO1hctqHrJJp6P0S8/mAmIAIyMlRj0Xkr4BTXBndkoF595hA7Ym?= =?utf-8?q?oN0BOAEBBsE50rSP48lMltSAEsImtNnnXzcHMrNnf7m4FJo71wNuSnX32m1rAbcFA?= =?utf-8?q?4Hb3oRQE2KZAFGwNWeNsoRv/HeWsxdSNqdc9ry7C5F0bFtx2jyEa6Glk=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR11MB2671.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Emh/v7X3ugfcFt24UGObTDXLRAyh?= =?utf-8?q?Si9THFXu1Bmkr6fp8oQv8PL3Tb45lw7jUynukpB+SQU0ikqa6CA4yEumFwkdxZcAR?= =?utf-8?q?Y20osu8r3yiKIz6OL4ajPtUR7hMTOnzTBak/MOp83046GWDGrW66xqSP7wk9YUHWK?= =?utf-8?q?pr7fgtlTWRS+cPvBKTGk+bJlH+Z5FOLtxvC6iBLPZFh2dVoeH9ecP81x3l8nN1pmU?= =?utf-8?q?D12ekYuOtiYsfS/BNk75Bf0/8HcXuzaqd/0+hpz/JS+dmsZ9Hlh07aMvCvrpJl+1p?= =?utf-8?q?Ig3BIDcUGnlAm+7mh1NyS1VtGOqkK8ecTR98+ux9lD/G946DNJMDGcPoaz7wYMJfw?= =?utf-8?q?vqw4udb053i7yN21DyijDWMeLkLhqzSGtCEurEd2VUscIk6KjcgGQJsccjHJ7VPqS?= =?utf-8?q?EaAurcw9gx3wa8dJEN3m3Ro8rJVPkzeHmZ1dmJtFtwAGL1Qu1PBGgK8cd7IAjgUQ4?= =?utf-8?q?TUHNFE1wuSZnzX4l2tAFd22gNN+ei/fJyE1Nvz0TYo4BKYsTk4i2gakuEbZqFQ5Up?= =?utf-8?q?NxzxNJjtUMtPnjKoJhPfFIVT3uG9ViX5FNyvNB+jTMGvu1NqF8e3mIfXUDXUWyje3?= =?utf-8?q?5xbwmirMfxSct5WvJAIIPbYq7eL4BYUvd8r6/7TSDlUnCnZ5uw6g+0EHZJ1RXhp6x?= =?utf-8?q?493gGiWeZ7sUqjbyJ40MZAkSeCgktoSkMtTpRIPxSCVopyHsv6+Bl4Jk3astBy8be?= =?utf-8?q?qily3nQf8NTHVnwxu1j2fJlqaW3onSClC6GK9hgaTbUUaNgcw2TD/v4wiXo7Lh1lu?= =?utf-8?q?PinG0I88sB2vrecjP3xw8nRKj8bPvGd9KkQkvECBEgSG1eCy3kw7Kr8Vz37NCcq14?= =?utf-8?q?wFd/BfLFX+cuc3McwLEjdsixXsIz6t+HTqa5OfNUTnubU2qNshyEbbS0MafiqUAeu?= =?utf-8?q?r0yjNS/eYR7oM/JI4JzDwSjmAHkTLif1vrjxYtPmOsSc3Dq++mqNUBfai62wph047?= =?utf-8?q?MFgDD08shfAVo0sKWcMKgmBNcOBap7bRrBe6cJ+ydgcTuUxkyyg1JEc8oA+FrhKh0?= =?utf-8?q?ZeXQLbEHz56tS4zwB0aphsiUurH8ro33I3JyZqCeu7YyMaLp2TIjZw0MIY+lg3z0A?= =?utf-8?q?mjUoUpqBc48GOQHF6wrlHJ/GTrVQai6ejurkQt3p6WwP6j5hFzJHmwlwV8WpSUDky?= =?utf-8?q?UJVxT49bNOGXZ4G2YSn0DquJvCsxHKoXjtLEfQZnlcw8md3ohG/ZQpO/ljEMxgAgH?= =?utf-8?q?kyq5PU5n/xDvbn36qzx/jvdIOdffa6ideZ81Thn3I//aTFyqXJkUyB9xzXnseNQ8N?= =?utf-8?q?nnYomuTVEWBvXUkTRvOxHxhh3X/LRw/P+hyb0oXNl+e2JCSbEonXm9WYuH3/G8oT9?= =?utf-8?q?uvLjgVFRxP/caZFub8V8EW5STQkKd0CC/bDp2WqM6CJoFtbOkCdS5hdNPY7YnF3Tu?= =?utf-8?q?vz+6h+wtqOvnnZJwIZmKQUbJd/OdwCkMv+jo8qbZ1ZSiLejsFSCiy1eS3/vSAriJF?= =?utf-8?q?tRMzhGe8OJCrz/sOj7+FJH5vETKM0jFa0+QhkdNxXwYsDAWkzbYOS2IfWM3AM6+pe?= =?utf-8?q?ulkW2P1bENdqBA3WatRPzanaCQ7/5kQSQA=3D=3D?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ed1d80b-f51c-492c-5862-08dcc24813a9 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2671.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 01:16:40.4537 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZgOitcgMYby4pSr7LFILJmM8Faxer/wE89OQdfIWhql9h6bvbhzrvtou0vz8zuXREu19rAHEr2seWQUOIpYROY3BQ0eHFql7kP53daXe/Eg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB4795 X-Proofpoint-ORIG-GUID: 3S2JpAerNt6EGbuYWfmKzFSDJ0pLhRt4 X-Authority-Analysis: v=2.4 cv=VdWlP0p9 c=1 sm=1 tr=0 ts=66c6917b cx=c_pps a=AVVanhwSUc+LQPSikfBlbg==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=yoJbH4e0A30A:10 a=bRTqI5nwn0kA:10 a=t7CeM3EgAAAA:8 a=GHR8O2WEAAAA:20 a=pGLkceISAAAA:8 a=YRHvXXt1AAAA:8 a=aLquMYcZFZkjG6VAuXEA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=FdTzh2GWekK77mhwV6Dw:22 a=9bw_jnHfPby8klRCszyn:22 X-Proofpoint-GUID: 3S2JpAerNt6EGbuYWfmKzFSDJ0pLhRt4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-08-21_17,2024-08-19_03,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 phishscore=0 spamscore=0 malwarescore=0 impostorscore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 priorityscore=1501 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.21.0-2407110000 definitions=main-2408220008 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 47M1E27n011993 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 22 Aug 2024 01:16:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203612 From: Guocai He 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 Signed-off-by: Guocai He --- .../0001-meson.build-set-c_std-to-gnu99.patch | 44 +++++++++++++++++++ .../libsoup/libsoup-2.4_2.74.2.bb | 4 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/0001-meson.build-set-c_std-to-gnu99.patch 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 @@ +From c41784deb1d4a923007ffe14cfa676f785808f45 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +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 +Signed-off-by: guocai +--- + 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 + 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" 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"