From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Moritz Bitsch <moritz@h6t.eu>,
James Hilliard <james.hilliard1@gmail.com>,
Fabrice Fontaine <fontaine.fabrice@gmail.com>,
Buildroot List <buildroot@buildroot.org>
Subject: Re: [Buildroot] [PATCH next 1/2] package/pkg-cargo: provide a single definition of CARGO_HOME value
Date: Sun, 6 Nov 2022 16:18:06 +0100 [thread overview]
Message-ID: <20221106151806.GZ3918838@scaer> (raw)
In-Reply-To: <20221103224539.692322-1-thomas.petazzoni@bootlin.com>
Thomas, All,
On 2022-11-03 23:45 +0100, Thomas Petazzoni via buildroot spake thusly:
> Instead of replicating $(HOST_DIR)/share/cargo in several place,
> define BR_CARGO_HOME. This will help when we'll want to change this
> location.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to next, thanks.
Regards,
Yann E. MORIN.
> ---
> package/pkg-cargo.mk | 6 ++++--
> package/suricata/suricata.mk | 2 +-
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk
> index f7e3f39503..5923725f5e 100644
> --- a/package/pkg-cargo.mk
> +++ b/package/pkg-cargo.mk
> @@ -20,8 +20,10 @@
> #
> ################################################################################
>
> +BR_CARGO_HOME = $(HOST_DIR)/share/cargo
> +
> PKG_COMMON_CARGO_ENV = \
> - CARGO_HOME=$(HOST_DIR)/share/cargo
> + CARGO_HOME=$(BR_CARGO_HOME)
>
> # __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS is needed to allow
> # passing the -Z target-applies-to-host, which is needed together with
> @@ -79,7 +81,7 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc
> $(2)_DEPENDENCIES += host-rustc
>
> $(2)_DOWNLOAD_POST_PROCESS = cargo
> -$(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo
> +$(2)_DL_ENV += CARGO_HOME=$$(BR_CARGO_HOME)
>
> # If building in a sub directory, use that to find the Cargo.toml
> ifneq ($$($(2)_SUBDIR),)
> diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk
> index 8c38b7c713..72b72cc94d 100644
> --- a/package/suricata/suricata.mk
> +++ b/package/suricata/suricata.mk
> @@ -29,7 +29,7 @@ SURICATA_DEPENDENCIES = \
>
> SURICATA_CONF_ENV = \
> ac_cv_path_HAVE_SPHINXBUILD=no \
> - CARGO_HOME=$(HOST_DIR)/share/cargo \
> + CARGO_HOME=$(BR_CARGO_HOME) \
> RUST_TARGET=$(RUSTC_TARGET_NAME)
>
> SURICATA_CONF_OPTS = \
> --
> 2.38.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
prev parent reply other threads:[~2022-11-06 15:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-03 22:45 [Buildroot] [PATCH next 1/2] package/pkg-cargo: provide a single definition of CARGO_HOME value Thomas Petazzoni via buildroot
2022-11-03 22:45 ` [Buildroot] [PATCH next 2/2] package/pkg-cargo: move CARGO_HOME into DL_DIR Thomas Petazzoni via buildroot
2022-11-04 8:54 ` Moritz Bitsch via buildroot
2022-11-06 15:03 ` Yann E. MORIN
2022-11-07 7:52 ` Thomas Petazzoni via buildroot
2022-11-07 17:33 ` Yann E. MORIN
2023-01-14 13:58 ` Yann E. MORIN
2023-01-14 14:17 ` Thomas Petazzoni via buildroot
2023-01-14 14:19 ` Yann E. MORIN
2022-11-06 15:18 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221106151806.GZ3918838@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@buildroot.org \
--cc=fontaine.fabrice@gmail.com \
--cc=james.hilliard1@gmail.com \
--cc=moritz@h6t.eu \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.