Steve,

I've noticed that you have:
b0e7777a91 scons: Pass MAXLINELENGTH to scons invocation
in contrib/stable/kirkstone-nut, but not this follow-up fix.

Please either take both of them or neither.

Cheers,

On Thu, Feb 2, 2023 at 9:41 AM Khem Raj <[email protected]> wrote:

> older scons do not support MAXLINELENGTH and some packages still may be
> using older scons, these recipes can clear SCONS_MAXLINELENGTH in them
> and get going. Set
>
> SCONS_MAXLINELENGTH = ""
>
> in such recipes.
>
> Signed-off-by: Khem Raj <[email protected]>
> Cc: Martin Jansa <[email protected]>
> ---
>  meta/classes-recipe/scons.bbclass | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/meta/classes-recipe/scons.bbclass
> b/meta/classes-recipe/scons.bbclass
> index d510c12b9b..d20a78dc6e 100644
> --- a/meta/classes-recipe/scons.bbclass
> +++ b/meta/classes-recipe/scons.bbclass
> @@ -10,11 +10,12 @@ DEPENDS += "python3-scons-native"
>
>  EXTRA_OESCONS ?= ""
>  # This value below is derived from $(getconf ARG_MAX)
> -SCONS_MAXLINELENGTH ?= "2097152"
> +SCONS_MAXLINELENGTH ?= "MAXLINELENGTH=2097152"
> +EXTRA_OESCONS:append = " ${SCONS_MAXLINELENGTH}"
>  do_configure() {
>         if [ -n "${CONFIGURESTAMPFILE}" -a "${S}" = "${B}" ]; then
>                 if [ -e "${CONFIGURESTAMPFILE}" -a "`cat
> ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ];
> then
> -                       ${STAGING_BINDIR_NATIVE}/scons --directory=${S}
> --clean PREFIX=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH}
> prefix=${prefix} ${EXTRA_OESCONS}
> +                       ${STAGING_BINDIR_NATIVE}/scons --directory=${S}
> --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS}
>                 fi
>
>                 mkdir -p `dirname ${CONFIGURESTAMPFILE}`
> @@ -23,12 +24,12 @@ do_configure() {
>  }
>
>  scons_do_compile() {
> -       ${STAGING_BINDIR_NATIVE}/scons --directory=${S} ${PARALLEL_MAKE}
> PREFIX=${prefix} prefix=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH}
> ${EXTRA_OESCONS} || \
> +       ${STAGING_BINDIR_NATIVE}/scons --directory=${S} ${PARALLEL_MAKE}
> PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \
>         die "scons build execution failed."
>  }
>
>  scons_do_install() {
> -       ${STAGING_BINDIR_NATIVE}/scons --directory=${S}
> install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix}
> MAXLINELENGTH=${SCONS_MAXLINELENGTH} ${EXTRA_OESCONS} install || \
> +       ${STAGING_BINDIR_NATIVE}/scons --directory=${S}
> install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix}
> ${EXTRA_OESCONS} install || \
>         die "scons install execution failed."
>  }
>
> --
> 2.39.1
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#177003): 
https://lists.openembedded.org/g/openembedded-core/message/177003
Mute This Topic: https://lists.openembedded.org/mt/96696439/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to