[Buildroot] [PATCH v2 1/3] package/rust/rust.mk: add missing host-zlib dependency

[Buildroot] [PATCH v2 1/3] package/rust/rust.mk: add missing host-zlib dependency

[Romain Naour]

Several rust tool are linking against zlib, so add
the depedency explicitely in HOST_RUST_DEPENDENCIES.

For now, host-rust build system is not able to find
provided by Buildroot in HOST_DIR due to at least two
issues that will be fixed in followup commits.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
v2: new commit
---
 package/rust/rust.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/rust/rust.mk b/package/rust/rust.mk
index f7a5c0fcd5..16a397407f 100644
--- a/package/rust/rust.mk
+++ b/package/rust/rust.mk
@@ -20,6 +20,7 @@ HOST_RUST_DEPENDENCIES = \
 	host-python3 \
 	host-rust-bin \
 	host-openssl \
+	host-zlib \
 	$(BR2_CMAKE_HOST_DEPENDENCY)
 
 HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0)
-- 
2.43.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 2/3] package/rust: use host libraries from HOST_DIR

[Romain Naour]

host-rust package depends on several host packages to provide tools and
libraries but it doesn't take into account HOST_DIR while building rustc
compiler. Indeed, rustc needs zlib and fail to link if zlib is not
installed on the host.

  error: could not compile `rustc_driver` (lib) due to previous error

If zlib is installed on the host, we can notice it with ldd tool (while
it should be linked with the one provided by Buildroot host-zlib).

  ldd [...]TestRust/host/bin/rustc
  libz.so.1 => /lib64/libz.so.1

Provide HOST_LDFLAGS using llvm.ldflags in config.toml.
(HOST_LDFLAGS provide -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib)

With that fixed, rustc_driver link with libz from HOST_DIR but the
host-rust build still fail later due to another issue.

  error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545
http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
v2: no change
---
 package/rust/rust.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/rust/rust.mk b/package/rust/rust.mk
index 16a397407f..4903060368 100644
--- a/package/rust/rust.mk
+++ b/package/rust/rust.mk
@@ -65,6 +65,7 @@ define HOST_RUST_CONFIGURE_CMDS
 		echo 'cc = "$(TARGET_CROSS)gcc"'; \
 		echo '[llvm]'; \
 		echo 'ninja = false'; \
+		echo 'ldflags = "$(HOST_LDFLAGS)"'; \
 	) > $(@D)/config.toml
 endef
 
-- 
2.43.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 3/3] package/rust: provide RUSTFLAGS for cargo

[Romain Naour]

While building the rust toolchain, the build system endup using
cargo (from [...]/output/build/host-rust-bin-1.74.1/cargo/bin/cargo)
to build some tool like rustdoc-tool.

But the host-rust package doesn't use the cargo infractructure (since
it provide cargo binary) and some cargo environment varialble [1] is
not set to crosscompile cargo packages in the rust toolchain.

For exemple, we usually set RUSTFLAGS="-C link-arg=-Wl,-rpath,$(HOST_DIR)/lib"
to force cargo using libraries provided by Buildroot in $(HOST_DIR)/lib.

RUSTFLAGS is actually needed to find zlib library (host-zlib) to link
rustdoc-tool when zlib is not installed on the host.

Fixes:

  error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error

[1] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.02-rc1/package/pkg-cargo.mk?ref_type=tags#L167

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
v2: no change
---
 package/rust/rust.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/rust/rust.mk b/package/rust/rust.mk
index 4903060368..394fbfa4ca 100644
--- a/package/rust/rust.mk
+++ b/package/rust/rust.mk
@@ -70,7 +70,9 @@ define HOST_RUST_CONFIGURE_CMDS
 endef
 
 define HOST_RUST_BUILD_CMDS
-	cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build
+	cd $(@D); $(HOST_MAKE_ENV) \
+		RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \
+		$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build
 endef
 
 HOST_RUST_INSTALL_OPTS = \
-- 
2.43.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 3/3] package/rust: provide RUSTFLAGS for cargo

[Yann E. MORIN]

Romain, All,

On 2024-02-29 23:41 +0100, Romain Naour spake thusly:
> While building the rust toolchain, the build system endup using
> cargo (from [...]/output/build/host-rust-bin-1.74.1/cargo/bin/cargo)
> to build some tool like rustdoc-tool.
> 
> But the host-rust package doesn't use the cargo infractructure (since
> it provide cargo binary) and some cargo environment varialble [1] is
> not set to crosscompile cargo packages in the rust toolchain.
> 
> For exemple, we usually set RUSTFLAGS="-C link-arg=-Wl,-rpath,$(HOST_DIR)/lib"
> to force cargo using libraries provided by Buildroot in $(HOST_DIR)/lib.
> 
> RUSTFLAGS is actually needed to find zlib library (host-zlib) to link
> rustdoc-tool when zlib is not installed on the host.
> 
> Fixes:
> 
>   error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error
> 
> [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.02-rc1/package/pkg-cargo.mk?ref_type=tags#L167
> 
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
> v2: no change
> ---
>  package/rust/rust.mk | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/package/rust/rust.mk b/package/rust/rust.mk
> index 4903060368..394fbfa4ca 100644
> --- a/package/rust/rust.mk
> +++ b/package/rust/rust.mk
> @@ -70,7 +70,9 @@ define HOST_RUST_CONFIGURE_CMDS
>  endef
>  
>  define HOST_RUST_BUILD_CMDS
> -	cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build
> +	cd $(@D); $(HOST_MAKE_ENV) \
> +		RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \

Why don't we jsut pass $(HOST_PKG_CARGO_ENV)? That one also contains
CARGO_HOME=$(DL_DIR)/br-cargo-home so I think it might make sense to
pass, no?

Regards,
Yann E. MORIN.

> +		$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build
>  endef
>  
>  HOST_RUST_INSTALL_OPTS = \
> -- 
> 2.43.2
> 
> _______________________________________________
> 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

Re: [Buildroot] [PATCH v2 3/3] package/rust: provide RUSTFLAGS for cargo

[Romain Naour]

Hello Yann,

Le 02/03/2024 à 22:45, Yann E. MORIN a écrit :
> Romain, All,
> 
> On 2024-02-29 23:41 +0100, Romain Naour spake thusly:
>> While building the rust toolchain, the build system endup using
>> cargo (from [...]/output/build/host-rust-bin-1.74.1/cargo/bin/cargo)
>> to build some tool like rustdoc-tool.
>>
>> But the host-rust package doesn't use the cargo infractructure (since
>> it provide cargo binary) and some cargo environment varialble [1] is
>> not set to crosscompile cargo packages in the rust toolchain.
>>
>> For exemple, we usually set RUSTFLAGS="-C link-arg=-Wl,-rpath,$(HOST_DIR)/lib"
>> to force cargo using libraries provided by Buildroot in $(HOST_DIR)/lib.
>>
>> RUSTFLAGS is actually needed to find zlib library (host-zlib) to link
>> rustdoc-tool when zlib is not installed on the host.
>>
>> Fixes:
>>
>>   error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error
>>
>> [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.02-rc1/package/pkg-cargo.mk?ref_type=tags#L167
>>
>> Signed-off-by: Romain Naour <romain.naour@smile.fr>
>> ---
>> v2: no change
>> ---
>>  package/rust/rust.mk | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/package/rust/rust.mk b/package/rust/rust.mk
>> index 4903060368..394fbfa4ca 100644
>> --- a/package/rust/rust.mk
>> +++ b/package/rust/rust.mk
>> @@ -70,7 +70,9 @@ define HOST_RUST_CONFIGURE_CMDS
>>  endef
>>  
>>  define HOST_RUST_BUILD_CMDS
>> -	cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build
>> +	cd $(@D); $(HOST_MAKE_ENV) \
>> +		RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \
> 
> Why don't we jsut pass $(HOST_PKG_CARGO_ENV)? That one also contains
> CARGO_HOME=$(DL_DIR)/br-cargo-home so I think it might make sense to
> pass, no?

I didn't verify if CARGO_HOME is really missing. Also HOST_PKG_CARGO_ENV is
defined by the cargo package infra (pkg-cargo.mk) while host-rust is a
host-generic package.

Otherwise, I'm agree. We should use $(HOST_PKG_CARGO_ENV)

Best regards,
Romain


> 
> Regards,
> Yann E. MORIN.
> 
>> +		$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build
>>  endef
>>  
>>  HOST_RUST_INSTALL_OPTS = \
>> -- 
>> 2.43.2
>>
>> _______________________________________________
>> 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

Re: [Buildroot] [PATCH v2 3/3] package/rust: provide RUSTFLAGS for cargo

[Yann E. MORIN]

Romain, All,

On 2024-03-02 22:54 +0100, Romain Naour spake thusly:
> Le 02/03/2024 à 22:45, Yann E. MORIN a écrit :
> > On 2024-02-29 23:41 +0100, Romain Naour spake thusly:
> >> While building the rust toolchain, the build system endup using
> >> cargo (from [...]/output/build/host-rust-bin-1.74.1/cargo/bin/cargo)
> >> to build some tool like rustdoc-tool.
[--SNIP--]
> >> diff --git a/package/rust/rust.mk b/package/rust/rust.mk
> >> index 4903060368..394fbfa4ca 100644
> >> --- a/package/rust/rust.mk
> >> +++ b/package/rust/rust.mk
> >> @@ -70,7 +70,9 @@ define HOST_RUST_CONFIGURE_CMDS
> >>  endef
> >>  
> >>  define HOST_RUST_BUILD_CMDS
> >> -	cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build
> >> +	cd $(@D); $(HOST_MAKE_ENV) \
> >> +		RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \
> > Why don't we jsut pass $(HOST_PKG_CARGO_ENV)? That one also contains
> > CARGO_HOME=$(DL_DIR)/br-cargo-home so I think it might make sense to
> > pass, no?
> I didn't verify if CARGO_HOME is really missing. Also HOST_PKG_CARGO_ENV is
> defined by the cargo package infra (pkg-cargo.mk) while host-rust is a
> host-generic package.
> 
> Otherwise, I'm agree. We should use $(HOST_PKG_CARGO_ENV)

OK, great, thanks! Will you test and respin a new iteration?

Regards,
Yann E. MORIN.

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

Re: [Buildroot] [PATCH v2 1/3] package/rust/rust.mk: add missing host-zlib dependency

[Yann E. MORIN]

Romain, All,

On 2024-02-29 23:41 +0100, Romain Naour spake thusly:
> Several rust tool are linking against zlib, so add
> the depedency explicitely in HOST_RUST_DEPENDENCIES.
> 
> For now, host-rust build system is not able to find
> provided by Buildroot in HOST_DIR due to at least two
> issues that will be fixed in followup commits.

I've slightly reflowed the commit log, and added a note about the
transitive depndency.

> Signed-off-by: Romain Naour <romain.naour@smile.fr>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> v2: new commit
> ---
>  package/rust/rust.mk | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/rust/rust.mk b/package/rust/rust.mk
> index f7a5c0fcd5..16a397407f 100644
> --- a/package/rust/rust.mk
> +++ b/package/rust/rust.mk
> @@ -20,6 +20,7 @@ HOST_RUST_DEPENDENCIES = \
>  	host-python3 \
>  	host-rust-bin \
>  	host-openssl \
> +	host-zlib \
>  	$(BR2_CMAKE_HOST_DEPENDENCY)
>  
>  HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0)
> -- 
> 2.43.2
> 
> _______________________________________________
> 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

Re: [Buildroot] [PATCH v2 2/3] package/rust: use host libraries from HOST_DIR

[Yann E. MORIN]

Romain, All,

On 2024-02-29 23:41 +0100, Romain Naour spake thusly:
> host-rust package depends on several host packages to provide tools and
> libraries but it doesn't take into account HOST_DIR while building rustc
> compiler. Indeed, rustc needs zlib and fail to link if zlib is not
> installed on the host.
> 
>   error: could not compile `rustc_driver` (lib) due to previous error
> 
> If zlib is installed on the host, we can notice it with ldd tool (while
> it should be linked with the one provided by Buildroot host-zlib).
> 
>   ldd [...]TestRust/host/bin/rustc
>   libz.so.1 => /lib64/libz.so.1
> 
> Provide HOST_LDFLAGS using llvm.ldflags in config.toml.
> (HOST_LDFLAGS provide -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib)
> 
> With that fixed, rustc_driver link with libz from HOST_DIR but the
> host-rust build still fail later due to another issue.
> 
>   error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error
> 
> Fixes:
> https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545
> http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0
> 
> Signed-off-by: Romain Naour <romain.naour@smile.fr>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> v2: no change
> ---
>  package/rust/rust.mk | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/rust/rust.mk b/package/rust/rust.mk
> index 16a397407f..4903060368 100644
> --- a/package/rust/rust.mk
> +++ b/package/rust/rust.mk
> @@ -65,6 +65,7 @@ define HOST_RUST_CONFIGURE_CMDS
>  		echo 'cc = "$(TARGET_CROSS)gcc"'; \
>  		echo '[llvm]'; \
>  		echo 'ninja = false'; \
> +		echo 'ldflags = "$(HOST_LDFLAGS)"'; \
>  	) > $(@D)/config.toml
>  endef
>  
> -- 
> 2.43.2
> 
> _______________________________________________
> 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