* [PATCH] scons.bbclass: Make MAXLINELENGTH overridable
@ 2023-02-02 8:41 Khem Raj
2023-02-11 9:21 ` Martin Jansa
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2023-02-02 8:41 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj, Martin Jansa
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] scons.bbclass: Make MAXLINELENGTH overridable
2023-02-02 8:41 [PATCH] scons.bbclass: Make MAXLINELENGTH overridable Khem Raj
@ 2023-02-11 9:21 ` Martin Jansa
2023-02-11 14:11 ` Steve Sakoman
0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2023-02-11 9:21 UTC (permalink / raw)
To: Steve Sakoman; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2674 bytes --]
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
>
>
[-- Attachment #2: Type: text/html, Size: 3563 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] scons.bbclass: Make MAXLINELENGTH overridable
2023-02-11 9:21 ` Martin Jansa
@ 2023-02-11 14:11 ` Steve Sakoman
0 siblings, 0 replies; 3+ messages in thread
From: Steve Sakoman @ 2023-02-11 14:11 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
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
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-11 14:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-02 8:41 [PATCH] scons.bbclass: Make MAXLINELENGTH overridable Khem Raj
2023-02-11 9:21 ` Martin Jansa
2023-02-11 14:11 ` Steve Sakoman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.