From 7f2d7385a9fbc2c25581dec0fa17ad8565bcbc39 Mon Sep 17 00:00:00 2001 From: Meng Li Date: Wed, 5 Jun 2024 19:11:13 +0800 Subject: meta-freescale: improve parameter definition of function errorFuncHandler Add a patch to adjust parameter definition of function errorFuncHandler, so that align with the definition in libxml2 package. Signed-off-by: Meng Li --- ...r-improve-parameter-definition-of-functio.patch | 56 ++++++++++++++++++++++ .../openembedded-layer/recipes-dpaa/fmc/fmc_git.bb | 3 ++ 2 files changed, 59 insertions(+) create mode 100644 dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch new file mode 100644 index 000000000..06cafa72d --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch @@ -0,0 +1,56 @@ +From 329c8ab2770ab34d887296a35585fac53c8bedb7 Mon Sep 17 00:00:00 2001 +From: Meng Li +Date: Wed, 5 Jun 2024 18:54:22 +0800 +Subject: [PATCH] FMCCFGReader: improve parameter definition of function + errorFuncHandler + +When building fmc package, there is below error: +FMCCFGReader.cpp: In member function 'void CCFGReader::parseCfgData(std::string)': +FMCCFGReader.cpp:98:40: error: invalid conversion from +'void (*)(void*, xmlErrorPtr)' {aka 'void (*)(void*, _xmlError*)'} to +'xmlStructuredErrorFunc' {aka 'void (*)(void*, const _xmlError*)'} [-fpermissive] + 98 | xmlSetStructuredErrorFunc( &error, errorFuncHandler ); + | ^~~~~~~~~~~~~~~~ + | | + | void (*)(void*, xmlErrorPtr) {aka void (*)(void*, _xmlError*)} +Because in libxml2 package, the parameter definition of function +pointer xmlStructuredErrorFunc has changed, adjust the parameter +of errorFuncHandler to align with upstream. + +Upstream-Status: Pending + +Signed-off-by: Meng Li +--- + source/FMCGenericError.cpp | 2 +- + source/FMCGenericError.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/source/FMCGenericError.cpp b/source/FMCGenericError.cpp +index a1a87a4..c11742c 100644 +--- a/source/FMCGenericError.cpp ++++ b/source/FMCGenericError.cpp +@@ -33,7 +33,7 @@ + #include "FMCUtils.h" + #include "logger.hpp" + +-void errorFuncHandler( void * ctx, xmlErrorPtr error ) ++void errorFuncHandler( void * ctx, const xmlError *error ) + { + char *filestr = (char*)""; + char *msgstr = (char*)""; +diff --git a/source/FMCGenericError.h b/source/FMCGenericError.h +index 504a81b..61ab6c1 100644 +--- a/source/FMCGenericError.h ++++ b/source/FMCGenericError.h +@@ -35,7 +35,7 @@ + + const int NO_LINE = -1; + +-void errorFuncHandler( void * ctx, xmlErrorPtr error ); ++void errorFuncHandler( void * ctx, const xmlError *error ); + + + class CGenericError { +-- +2.34.1 + diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb index 62a717721..457a202c9 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb @@ -7,6 +7,9 @@ PR = "r2" DEPENDS = "libxml2 fmlib tclap" SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" +SRC_URI:append = " \ + file://0001-FMCCFGReader-improve-parameter-definition-of-functio.patch \ +" SRCREV = "63c8ac99899a9bcd723801579b4d786594670455" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf