> -----Original Message-----
> From: [email protected] 
> <[email protected]> On Behalf Of Peter Marko via
> lists.openembedded.org
> Sent: den 2 september 2023 11:54
> To: [email protected]
> Subject: Re: [OE-core][PATCH] gcc-runtime: remove bashism
> 
> Gentle ping.
> Thanks.
> 
> -----Original Message-----
> From: [email protected] 
> <[email protected]> On Behalf Of Peter Marko via
> lists.openembedded.org
> Sent: Tuesday, August 1, 2023 8:19
> To: [email protected]
> Cc: Marko, Peter (ADV D EU SK BFS1) <[email protected]>
> Subject: [OE-core][PATCH] gcc-runtime: remove bashism
> 
> > From: Peter Marko <[email protected]>
> >
> > Debian 12 no longer supports replacing dash with bash as default shell.
> > Therefore to achieve compatibility with Debian 12, all bashisms need to be 
> > removed.
> >
> > Shell comparison via == gives an error with dash and thus the condition is 
> > always false.
> >
> > Signed-off-by: Peter Marko <[email protected]>
> > ---
> >  meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc 
> > b/meta/recipes-devtools/gcc/gcc-runtime.inc
> > index bccc8a5b89..64b6168ba7 100644
> > --- a/meta/recipes-devtools/gcc/gcc-runtime.inc
> > +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
> > @@ -132,7 +132,7 @@ do_install:append:class-target () {
> >             ln -s ../${TARGET_SYS}/ext 
> > ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext
> >     fi
> >
> > -   if [ "${TARGET_ARCH}" == "x86_64" -a "${MULTILIB_VARIANTS}" != "" ];then
> > +   if [ "${TARGET_ARCH}" = "x86_64" -a "${MULTILIB_VARIANTS}" != ""
> > +];then

Change that to:

        if [ "${TARGET_ARCH}" = x86_64 ] && [ "${MULTILIB_VARIANTS}" ]; then

* Static strings without spaces and special characters do not need quotes.
* You want to avoid the -a and -o operators for test.
* Checking that a string has a value does not need the != "".
* There is no reason to break the line.

> >             ln -sf ../${X86ARCH32}${TARGET_VENDOR}-${TARGET_OS} 
> > ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}/32
> >     fi
> >
> > --
> > 2.30.2

//Peter

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#187148): 
https://lists.openembedded.org/g/openembedded-core/message/187148
Mute This Topic: https://lists.openembedded.org/mt/101111089/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to