* [Buildroot] [PATCH] package/pkg-waf: add missing $
@ 2023-02-11 9:42 Romain Naour
2023-02-11 9:51 ` Yann E. MORIN
2023-02-11 10:04 ` Yann E. MORIN
0 siblings, 2 replies; 4+ messages in thread
From: Romain Naour @ 2023-02-11 9:42 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Yann E . MORIN
We want to have $(@D) expanded at the time the recipe is run, so like
all other variables, we need to $$-expand it.
Fixes:
http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <peter@korsgaard.com>
---
package/pkg-waf.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk
index 0e752072c8..c3e965bdf3 100644
--- a/package/pkg-waf.mk
+++ b/package/pkg-waf.mk
@@ -42,7 +42,7 @@ define inner-waf-package
# otherwise waf errors out with:
# Waf script 'X' and library 'Y' do not match
define WAF_PACKAGE_REMOVE_WAF_LIB
- $(RM) -fr $(@D)/waf $(@D)/waflib
+ $(RM) -fr $$(@D)/waf $$(@D)/waflib
endef
# We need host-python3 to run waf
--
2.34.3
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH] package/pkg-waf: add missing $
2023-02-11 9:42 [Buildroot] [PATCH] package/pkg-waf: add missing $ Romain Naour
@ 2023-02-11 9:51 ` Yann E. MORIN
2023-02-11 9:57 ` Romain Naour
2023-02-11 10:04 ` Yann E. MORIN
1 sibling, 1 reply; 4+ messages in thread
From: Yann E. MORIN @ 2023-02-11 9:51 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
Romain. All,
On 2023-02-11 10:42 +0100, Romain Naour spake thusly:
> We want to have $(@D) expanded at the time the recipe is run, so like
> all other variables, we need to $$-expand it.
>
> Fixes:
> http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826
Thanks for the quick fix, but se below...
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Peter Korsgaard <peter@korsgaard.com>
> ---
> package/pkg-waf.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk
> index 0e752072c8..c3e965bdf3 100644
> --- a/package/pkg-waf.mk
> +++ b/package/pkg-waf.mk
> @@ -42,7 +42,7 @@ define inner-waf-package
> # otherwise waf errors out with:
> # Waf script 'X' and library 'Y' do not match
> define WAF_PACKAGE_REMOVE_WAF_LIB
> - $(RM) -fr $(@D)/waf $(@D)/waflib
> + $(RM) -fr $$(@D)/waf $$(@D)/waflib
Shouldn't we be using $$($$(PKG)_SRCDIR) or $$($(2)_SRCDIR) instead of
$$(@D), like is used everywhere else in the file:
cd $$($$(PKG)_SRCDIR) && python3 configure [...]
cd $$($$(PKG)_SRCDIR) && python3 $$($(2)_WAF)
(Note that last one uses a mix of $$(PKG) and $(2)...)
Regards,
Yann E. MORIN.
> endef
>
> # We need host-python3 to run waf
> --
> 2.34.3
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH] package/pkg-waf: add missing $
2023-02-11 9:51 ` Yann E. MORIN
@ 2023-02-11 9:57 ` Romain Naour
0 siblings, 0 replies; 4+ messages in thread
From: Romain Naour @ 2023-02-11 9:57 UTC (permalink / raw)
To: Yann E. MORIN, Romain Naour; +Cc: buildroot
Le 11/02/2023 à 10:51, Yann E. MORIN a écrit :
> Romain. All,
>
> On 2023-02-11 10:42 +0100, Romain Naour spake thusly:
>> We want to have $(@D) expanded at the time the recipe is run, so like
>> all other variables, we need to $$-expand it.
>>
>> Fixes:
>> http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826
>
> Thanks for the quick fix, but se below...
>
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
>> Cc: Peter Korsgaard <peter@korsgaard.com>
>> ---
>> package/pkg-waf.mk | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk
>> index 0e752072c8..c3e965bdf3 100644
>> --- a/package/pkg-waf.mk
>> +++ b/package/pkg-waf.mk
>> @@ -42,7 +42,7 @@ define inner-waf-package
>> # otherwise waf errors out with:
>> # Waf script 'X' and library 'Y' do not match
>> define WAF_PACKAGE_REMOVE_WAF_LIB
>> - $(RM) -fr $(@D)/waf $(@D)/waflib
>> + $(RM) -fr $$(@D)/waf $$(@D)/waflib
>
> Shouldn't we be using $$($$(PKG)_SRCDIR) or $$($(2)_SRCDIR) instead of
> $$(@D), like is used everywhere else in the file:
>
> cd $$($$(PKG)_SRCDIR) && python3 configure [...]
>
> cd $$($$(PKG)_SRCDIR) && python3 $$($(2)_WAF)
>
> (Note that last one uses a mix of $$(PKG) and $(2)...)
I guess @D come from the HOOK from aubio and move to pkg-waf.
It seems @D is used at several place in pkg-<*>.mk infra.
I'm not sure what we prefer/should use.
Best regards,
Romain
>
> Regards,
> Yann E. MORIN.
>
>> endef
>>
>> # We need host-python3 to run waf
>> --
>> 2.34.3
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH] package/pkg-waf: add missing $
2023-02-11 9:42 [Buildroot] [PATCH] package/pkg-waf: add missing $ Romain Naour
2023-02-11 9:51 ` Yann E. MORIN
@ 2023-02-11 10:04 ` Yann E. MORIN
1 sibling, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2023-02-11 10:04 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
Romain, All,
On 2023-02-11 10:42 +0100, Romain Naour spake thusly:
> We want to have $(@D) expanded at the time the recipe is run, so like
> all other variables, we need to $$-expand it.
>
> Fixes:
> http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Peter Korsgaard <peter@korsgaard.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/pkg-waf.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk
> index 0e752072c8..c3e965bdf3 100644
> --- a/package/pkg-waf.mk
> +++ b/package/pkg-waf.mk
> @@ -42,7 +42,7 @@ define inner-waf-package
> # otherwise waf errors out with:
> # Waf script 'X' and library 'Y' do not match
> define WAF_PACKAGE_REMOVE_WAF_LIB
> - $(RM) -fr $(@D)/waf $(@D)/waflib
> + $(RM) -fr $$(@D)/waf $$(@D)/waflib
> endef
>
> # We need host-python3 to run waf
> --
> 2.34.3
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-11 10:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-11 9:42 [Buildroot] [PATCH] package/pkg-waf: add missing $ Romain Naour
2023-02-11 9:51 ` Yann E. MORIN
2023-02-11 9:57 ` Romain Naour
2023-02-11 10:04 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox