diff mbox series

scons.bbclass: Make MAXLINELENGTH overridable

Message ID 20230202084116.2583868-1-raj.khem@gmail.com
State New
Headers show
Series scons.bbclass: Make MAXLINELENGTH overridable | expand

Commit Message

Khem Raj Feb. 2, 2023, 8:41 a.m. UTC 
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 <raj.khem@gmail.com>
Cc: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes-recipe/scons.bbclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Martin Jansa Feb. 11, 2023, 9:21 a.m. UTC | #1 
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 <raj.khem@gmail.com> 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 <raj.khem@gmail.com>
> Cc: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  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
>
>
Steve Sakoman Feb. 11, 2023, 2:11 p.m. UTC | #2 
On Fri, Feb 10, 2023 at 11:22 PM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> 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.

Got it!

Thanks,

Steve

> On Thu, Feb 2, 2023 at 9:41 AM Khem Raj <raj.khem@gmail.com> 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 <raj.khem@gmail.com>
>> Cc: Martin Jansa <Martin.Jansa@gmail.com>
>> ---
>>  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
>>
diff mbox series

Patch

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."
 }