Fix Bug-14613

Message ID 20211115125853.123820-1-pgowda.cve@gmail.com
State New
Headers show
Series Fix Bug-14613 | expand

Commit Message

Pgowda Nov. 15, 2021, 12:58 p.m. UTC
Source:- https://bugzilla.yoctoproject.org/show_bug.cgi?id=14613

Adds TUNE_PKGARCH to PN so that it picks correct TUNE_FEATURES.

Signed-off-by: Pgowda <pgowda.cve@gmail.com>
---
 meta/recipes-devtools/rust/rust-cross.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Richard Purdie Nov. 15, 2021, 1:01 p.m. UTC | #1
On Mon, 2021-11-15 at 04:58 -0800, Pgowda wrote:
> Source:- https://bugzilla.yoctoproject.org/show_bug.cgi?id=14613
> 
> Adds TUNE_PKGARCH to PN so that it picks correct TUNE_FEATURES.
> 
> Signed-off-by: Pgowda <pgowda.cve@gmail.com>
> ---
>  meta/recipes-devtools/rust/rust-cross.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/rust/rust-cross.inc b/meta/recipes-devtools/rust/rust-cross.inc
> index bb625f4240..30c92ed395 100644
> --- a/meta/recipes-devtools/rust/rust-cross.inc
> +++ b/meta/recipes-devtools/rust/rust-cross.inc
> @@ -34,7 +34,7 @@ DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs vir
>  DEPENDS += "rust-native"
>  
>  PROVIDES = "virtual/${TARGET_PREFIX}rust"
> -PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}"
> +PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}-${TUNE_PKGARCH}"
>  
>  # In the cross compilation case, rustc doesn't seem to get the rpath quite
>  # right. It manages to include '../../lib/${TARGET_PREFIX}', but doesn't

If we do this we can drop the TARGET_ARCH piece since that isn't needed with the
more specific tune present.

Cheers,

Richard
Richard Purdie Nov. 15, 2021, 1:03 p.m. UTC | #2
On Mon, 2021-11-15 at 04:58 -0800, Pgowda wrote:
> Source:- https://bugzilla.yoctoproject.org/show_bug.cgi?id=14613
> 
> Adds TUNE_PKGARCH to PN so that it picks correct TUNE_FEATURES.
> 

Also, the short log needs to be in the format matching our commit guidelines so
something like:

rust-cross: Replace TARGET_ARCH with TUNE_PKGARCH

and then the full log needs to describe what issues there were, why the commit
is necessary and how this fixes it. It should be readable without looking at the
bugzilla entry.

The format for a link to the bugzilla entry is:

[YOCTO #14613]

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/rust/rust-cross.inc b/meta/recipes-devtools/rust/rust-cross.inc
index bb625f4240..30c92ed395 100644
--- a/meta/recipes-devtools/rust/rust-cross.inc
+++ b/meta/recipes-devtools/rust/rust-cross.inc
@@ -34,7 +34,7 @@  DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs vir
 DEPENDS += "rust-native"
 
 PROVIDES = "virtual/${TARGET_PREFIX}rust"
-PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}"
+PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}-${TUNE_PKGARCH}"
 
 # In the cross compilation case, rustc doesn't seem to get the rpath quite
 # right. It manages to include '../../lib/${TARGET_PREFIX}', but doesn't