git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 0b19e10a8a52fab0bfadbac5ce70f1b2d185a1d1 Mon Sep 17 00:00:00 2001
   2 From: Hongxu Jia <hongxu.jia@windriver.com>
   3 Date: Wed, 21 May 2025 13:09:25 +0800
   4 Subject: [PATCH] fix lttng-tools fails to compile with libxml2 2.14.0+
   5
   6 Description:
   7 | In file included from /srv/pokybuild/yocto-worker/qemux86-alt/build/build/tmp/work/core2-32-poky-linux/lttng-tools/2.13.15/recipe-sysroot/usr/include/libxml2/libxml/parser.h:25,
   8 |                  from ../../../../lttng-tools-2.13.15/src/common/config/session-config.c:29:
   9 | /srv/pokybuild/yocto-worker/qemux86-alt/build/build/tmp/work/core2-32-poky-linux/lttng-tools/2.13.15/recipe-sysroot/usr/include/libxml2/libxml/encoding.h:173:7: note: declared here
  10 |   173 |     } input XML_DEPRECATED_MEMBER;
  11 |       |       ^~~~~
  12 | ../../../../lttng-tools-2.13.15/src/common/config/session-config.c:432:15: error: called object is not a function or function pointer
  13 |   432 |         ret = handler->input(out_str, &out_len, (const xmlChar *) in_str, &in_len);
  14 |       |               ^~~~~~~
  15 | At top level:
  16 | cc1: note: unrecognized command-line option '-Wno-incomplete-setjmp-declaration' may have been intended to silence earlier diagnostics
  17
  18
  19 According to [1][2], the UTF-8 handler is
  20 ```
  21 static xmlCharEncError
  22 UTF8ToUTF8(void *vctxt ATTRIBUTE_UNUSED,
  23            unsigned char* out, int *outlen,
  24            const unsigned char* in, int *inlen,
  25            int flush ATTRIBUTE_UNUSED)
  26 ```
  27
  28 Update input.func with setting ATTRIBUTE_UNUSED params with NULL and 0
  29
  30 [1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/38f475072aefe032fff1dc058df3e56c1e7062fa
  31 [2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/69b83bb68e2a8ed0013f80c51b9a358714b00c9a#478024cc18a2cc8dbaed34076e9775f6827f413d_2188_2201
  32
  33 Upstream-Status: Submitted [https://github.com/lttng/lttng-tools/pull/170]
  34 Signed-off-by: Marko, Peter <Peter.Marko@siemens.com>
  35 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  36 ---
  37  src/common/config/session-config.c | 2 +-
  38  1 file changed, 1 insertion(+), 1 deletion(-)
  39
  40 diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
  41 index bb4e9fe..4042d34 100644
  42 --- a/src/common/config/session-config.c
  43 +++ b/src/common/config/session-config.c
  44 @@ -429,7 +429,7 @@ static xmlChar *encode_string(const char *in_str)
  45                 goto end;
  46         }
  47
  48 -       ret = handler->input(out_str, &out_len, (const xmlChar *) in_str, &in_len);
  49 +       ret = handler->input.func(NULL, out_str, &out_len, (const xmlChar *) in_str, &in_len, 0);
  50         if (ret < 0) {
  51                 xmlFree(out_str);
  52                 out_str = NULL;
  53 --
  54 2.34.1
  55