diff options
| author | Meng Li <Meng.Li@windriver.com> | 2024-06-05 19:11:13 +0800 |
|---|---|---|
| committer | Meng Li <meng.li@windriver.com> | 2024-06-07 09:00:32 +0800 |
| commit | 7f2d7385a9fbc2c25581dec0fa17ad8565bcbc39 (patch) | |
| tree | c65097dc14f9f1a7dd5d431a7abcf13478ab5a17 /dynamic-layers | |
| parent | 2714792483012f0980daded1d6a5d9ba8f742d32 (diff) | |
| download | meta-freescale-7f2d7385a9fbc2c25581dec0fa17ad8565bcbc39.tar.gz | |
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 <Meng.Li@windriver.com>
Diffstat (limited to 'dynamic-layers')
2 files changed, 59 insertions, 0 deletions
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 @@ | |||
| 1 | From 329c8ab2770ab34d887296a35585fac53c8bedb7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Meng Li <Meng.Li@windriver.com> | ||
| 3 | Date: Wed, 5 Jun 2024 18:54:22 +0800 | ||
| 4 | Subject: [PATCH] FMCCFGReader: improve parameter definition of function | ||
| 5 | errorFuncHandler | ||
| 6 | |||
| 7 | When building fmc package, there is below error: | ||
| 8 | FMCCFGReader.cpp: In member function 'void CCFGReader::parseCfgData(std::string)': | ||
| 9 | FMCCFGReader.cpp:98:40: error: invalid conversion from | ||
| 10 | 'void (*)(void*, xmlErrorPtr)' {aka 'void (*)(void*, _xmlError*)'} to | ||
| 11 | 'xmlStructuredErrorFunc' {aka 'void (*)(void*, const _xmlError*)'} [-fpermissive] | ||
| 12 | 98 | xmlSetStructuredErrorFunc( &error, errorFuncHandler ); | ||
| 13 | | ^~~~~~~~~~~~~~~~ | ||
| 14 | | | | ||
| 15 | | void (*)(void*, xmlErrorPtr) {aka void (*)(void*, _xmlError*)} | ||
| 16 | Because in libxml2 package, the parameter definition of function | ||
| 17 | pointer xmlStructuredErrorFunc has changed, adjust the parameter | ||
| 18 | of errorFuncHandler to align with upstream. | ||
| 19 | |||
| 20 | Upstream-Status: Pending | ||
| 21 | |||
| 22 | Signed-off-by: Meng Li <Meng.Li@windriver.com> | ||
| 23 | --- | ||
| 24 | source/FMCGenericError.cpp | 2 +- | ||
| 25 | source/FMCGenericError.h | 2 +- | ||
| 26 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 27 | |||
| 28 | diff --git a/source/FMCGenericError.cpp b/source/FMCGenericError.cpp | ||
| 29 | index a1a87a4..c11742c 100644 | ||
| 30 | --- a/source/FMCGenericError.cpp | ||
| 31 | +++ b/source/FMCGenericError.cpp | ||
| 32 | @@ -33,7 +33,7 @@ | ||
| 33 | #include "FMCUtils.h" | ||
| 34 | #include "logger.hpp" | ||
| 35 | |||
| 36 | -void errorFuncHandler( void * ctx, xmlErrorPtr error ) | ||
| 37 | +void errorFuncHandler( void * ctx, const xmlError *error ) | ||
| 38 | { | ||
| 39 | char *filestr = (char*)""; | ||
| 40 | char *msgstr = (char*)""; | ||
| 41 | diff --git a/source/FMCGenericError.h b/source/FMCGenericError.h | ||
| 42 | index 504a81b..61ab6c1 100644 | ||
| 43 | --- a/source/FMCGenericError.h | ||
| 44 | +++ b/source/FMCGenericError.h | ||
| 45 | @@ -35,7 +35,7 @@ | ||
| 46 | |||
| 47 | const int NO_LINE = -1; | ||
| 48 | |||
| 49 | -void errorFuncHandler( void * ctx, xmlErrorPtr error ); | ||
| 50 | +void errorFuncHandler( void * ctx, const xmlError *error ); | ||
| 51 | |||
| 52 | |||
| 53 | class CGenericError { | ||
| 54 | -- | ||
| 55 | 2.34.1 | ||
| 56 | |||
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" | |||
| 7 | DEPENDS = "libxml2 fmlib tclap" | 7 | DEPENDS = "libxml2 fmlib tclap" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" | 9 | SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" |
| 10 | SRC_URI:append = " \ | ||
| 11 | file://0001-FMCCFGReader-improve-parameter-definition-of-functio.patch \ | ||
| 12 | " | ||
| 10 | SRCREV = "63c8ac99899a9bcd723801579b4d786594670455" | 13 | SRCREV = "63c8ac99899a9bcd723801579b4d786594670455" |
| 11 | 14 | ||
| 12 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
