All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: enable -Z target-applies-to-host via env
@ 2022-01-09  8:47 James Hilliard
  2022-01-09 11:14 ` Thomas Petazzoni
  2022-07-25 13:27 ` Yann E. MORIN
  0 siblings, 2 replies; 4+ messages in thread
From: James Hilliard @ 2022-01-09  8:47 UTC (permalink / raw)
  To: buildroot; +Cc: James Hilliard

This should be more reliable and fix the host == target bug when
doing indirect invocations using the cargo env.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/pkg-cargo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk
index 47ae86bfae..b6cb65c4f0 100644
--- a/package/pkg-cargo.mk
+++ b/package/pkg-cargo.mk
@@ -27,6 +27,7 @@
 PKG_CARGO_ENV = \
 	CARGO_HOME=$(HOST_DIR)/share/cargo \
 	__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \
+	CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \
 	CARGO_TARGET_APPLIES_TO_HOST="false"
 
 ################################################################################
@@ -88,7 +89,6 @@ define $(2)_BUILD_CMDS
 			$$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \
 			--manifest-path Cargo.toml \
 			--locked \
-			-Z target-applies-to-host \
 			$$($(2)_CARGO_BUILD_OPTS)
 endef
 else # ifeq ($(4),target)
-- 
2.25.1

_______________________________________________
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 1/1] package/pkg-cargo.mk: enable -Z target-applies-to-host via env
  2022-01-09  8:47 [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: enable -Z target-applies-to-host via env James Hilliard
@ 2022-01-09 11:14 ` Thomas Petazzoni
  2022-07-25 13:27 ` Yann E. MORIN
  1 sibling, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2022-01-09 11:14 UTC (permalink / raw)
  To: James Hilliard; +Cc: buildroot

On Sun,  9 Jan 2022 01:47:32 -0700
James Hilliard <james.hilliard1@gmail.com> wrote:

> This should be more reliable and fix the host == target bug when
> doing indirect invocations using the cargo env.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/pkg-cargo.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I've applied, after integrating that into a larger series, and adding
more comments in the code about all those variables.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
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 1/1] package/pkg-cargo.mk: enable -Z target-applies-to-host via env
  2022-01-09  8:47 [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: enable -Z target-applies-to-host via env James Hilliard
  2022-01-09 11:14 ` Thomas Petazzoni
@ 2022-07-25 13:27 ` Yann E. MORIN
  2022-07-25 18:52   ` James Hilliard
  1 sibling, 1 reply; 4+ messages in thread
From: Yann E. MORIN @ 2022-07-25 13:27 UTC (permalink / raw)
  To: James Hilliard; +Cc: buildroot

James, All,

Resurecting this old patch that was applied, but I have a question about
it, see below...

On 2022-01-09 01:47 -0700, James Hilliard spake thusly:
> This should be more reliable and fix the host == target bug when
> doing indirect invocations using the cargo env.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/pkg-cargo.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk
> index 47ae86bfae..b6cb65c4f0 100644
> --- a/package/pkg-cargo.mk
> +++ b/package/pkg-cargo.mk
> @@ -27,6 +27,7 @@
>  PKG_CARGO_ENV = \
>  	CARGO_HOME=$(HOST_DIR)/share/cargo \
>  	__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \
> +	CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \
>  	CARGO_TARGET_APPLIES_TO_HOST="false"
>  
>  ################################################################################
> @@ -88,7 +89,6 @@ define $(2)_BUILD_CMDS
>  			$$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \
>  			--manifest-path Cargo.toml \
>  			--locked \
> -			-Z target-applies-to-host \

Did you forget to remove it from the _INSTALL_TARGET_CMDS?

Regards,
Yann E. MORIN.

>  			$$($(2)_CARGO_BUILD_OPTS)
>  endef
>  else # ifeq ($(4),target)
> -- 
> 2.25.1
> 
> _______________________________________________
> 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 1/1] package/pkg-cargo.mk: enable -Z target-applies-to-host via env
  2022-07-25 13:27 ` Yann E. MORIN
@ 2022-07-25 18:52   ` James Hilliard
  0 siblings, 0 replies; 4+ messages in thread
From: James Hilliard @ 2022-07-25 18:52 UTC (permalink / raw)
  To: Yann E. MORIN; +Cc: buildroot

On Mon, Jul 25, 2022 at 7:28 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> James, All,
>
> Resurecting this old patch that was applied, but I have a question about
> it, see below...
>
> On 2022-01-09 01:47 -0700, James Hilliard spake thusly:
> > This should be more reliable and fix the host == target bug when
> > doing indirect invocations using the cargo env.
> >
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> > ---
> >  package/pkg-cargo.mk | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk
> > index 47ae86bfae..b6cb65c4f0 100644
> > --- a/package/pkg-cargo.mk
> > +++ b/package/pkg-cargo.mk
> > @@ -27,6 +27,7 @@
> >  PKG_CARGO_ENV = \
> >       CARGO_HOME=$(HOST_DIR)/share/cargo \
> >       __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \
> > +     CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \
> >       CARGO_TARGET_APPLIES_TO_HOST="false"
> >
> >  ################################################################################
> > @@ -88,7 +89,6 @@ define $(2)_BUILD_CMDS
> >                       $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \
> >                       --manifest-path Cargo.toml \
> >                       --locked \
> > -                     -Z target-applies-to-host \
>
> Did you forget to remove it from the _INSTALL_TARGET_CMDS?

Yeah, looks like it.

>
> Regards,
> Yann E. MORIN.
>
> >                       $$($(2)_CARGO_BUILD_OPTS)
> >  endef
> >  else # ifeq ($(4),target)
> > --
> > 2.25.1
> >
> > _______________________________________________
> > 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:[~2022-07-25 18:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-09  8:47 [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: enable -Z target-applies-to-host via env James Hilliard
2022-01-09 11:14 ` Thomas Petazzoni
2022-07-25 13:27 ` Yann E. MORIN
2022-07-25 18:52   ` James Hilliard

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.