[meta-security] Parsec-service: Fix arm32 build

Message ID 20220523120403.1680130-1-Anton.Antonov@arm.com
State Accepted, archived
Delegated to: Armin Kuster
Headers show
Series [meta-security] Parsec-service: Fix arm32 build | expand

Commit Message

Anton Antonov May 23, 2022, 12:04 p.m. UTC
Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
---
 .../recipes-parsec/parsec-service/parsec-service_1.0.0.bb   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

akuster808 May 26, 2022, 11:10 p.m. UTC | #1
thanks.

merged.

On 5/23/22 05:04, Anton Antonov wrote:
> Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
> ---
>   .../recipes-parsec/parsec-service/parsec-service_1.0.0.bb   | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb
> index ad7e560..84539f9 100644
> --- a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb
> +++ b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb
> @@ -26,7 +26,11 @@ PARSEC_FEATURES = "${@d.getVar('PACKAGECONFIG_CONFARGS',True).strip().replace('
>   CARGO_BUILD_FLAGS += " --features ${PARSEC_FEATURES}"
>   
>   export BINDGEN_EXTRA_CLANG_ARGS
> -BINDGEN_EXTRA_CLANG_ARGS = "--sysroot=${WORKDIR}/recipe-sysroot -I${WORKDIR}/recipe-sysroot/usr/include"
> +target = "${@d.getVar('TARGET_SYS',True).replace('-', ' ')}"
> +BINDGEN_EXTRA_CLANG_ARGS = "${@bb.utils.contains('target', 'arm', \
> +                              '--sysroot=${WORKDIR}/recipe-sysroot -I${WORKDIR}/recipe-sysroot/usr/include -mfloat-abi=hard', \
> +                              '--sysroot=${WORKDIR}/recipe-sysroot -I${WORKDIR}/recipe-sysroot/usr/include', \
> +                              d)}"
>   
>   inherit systemd
>   SYSTEMD_SERVICE:${PN} = "parsec.service"
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#57154): https://lists.yoctoproject.org/g/yocto/message/57154
> Mute This Topic: https://lists.yoctoproject.org/mt/91286325/3616698
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [akuster808@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb
index ad7e560..84539f9 100644
--- a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb
+++ b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb
@@ -26,7 +26,11 @@  PARSEC_FEATURES = "${@d.getVar('PACKAGECONFIG_CONFARGS',True).strip().replace('
 CARGO_BUILD_FLAGS += " --features ${PARSEC_FEATURES}"
 
 export BINDGEN_EXTRA_CLANG_ARGS
-BINDGEN_EXTRA_CLANG_ARGS = "--sysroot=${WORKDIR}/recipe-sysroot -I${WORKDIR}/recipe-sysroot/usr/include"
+target = "${@d.getVar('TARGET_SYS',True).replace('-', ' ')}"
+BINDGEN_EXTRA_CLANG_ARGS = "${@bb.utils.contains('target', 'arm', \
+                              '--sysroot=${WORKDIR}/recipe-sysroot -I${WORKDIR}/recipe-sysroot/usr/include -mfloat-abi=hard', \
+                              '--sysroot=${WORKDIR}/recipe-sysroot -I${WORKDIR}/recipe-sysroot/usr/include', \
+                              d)}"
 
 inherit systemd
 SYSTEMD_SERVICE:${PN} = "parsec.service"