Patchwork [4/4] recipes/crosstool-ng/gcc-versions: Do not add toolchain_kernel_version_machine to RECIPE FLAGS when not used

login
register
mail settings
Submitter Morten Svendsen
Date Oct. 5, 2012, 9:51 a.m.
Message ID <2db3fc42b50573b58f569e6acb708df30c93c26d.1349430062.git.morten.thunbergsvendsen@prevas.dk>
Download mbox | patch
Permalink /patch/189454/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Morten Svendsen - Oct. 5, 2012, 9:51 a.m.
The useflags.oeclass sets EXTRA_ARCH to '.${MACHINE}' if a MACHINE_USE_ flag is set.
When setting MACHINE_USE_toolchain_kernel_version_machine in gcc native, sdk and cross-sdk, the MACHINE var would be used
even though it is blacklisted for those recipe types.
---
 recipes/crosstool-ng/gcc-versions.inc |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Esben Haabendal - Oct. 5, 2012, 3:15 p.m.
Morten Thunberg Svendsen <morten.thunbergsvendsen@prevas.dk> writes:

> The useflags.oeclass sets EXTRA_ARCH to '.${MACHINE}' if a
> MACHINE_USE_ flag is set.  When setting
> MACHINE_USE_toolchain_kernel_version_machine in gcc native, sdk and
> cross-sdk, the MACHINE var would be used even though it is blacklisted
> for those recipe types.
> ---
>  recipes/crosstool-ng/gcc-versions.inc |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/recipes/crosstool-ng/gcc-versions.inc b/recipes/crosstool-ng/gcc-versions.inc
> index e3f941b..1c339e3 100644
> --- a/recipes/crosstool-ng/gcc-versions.inc
> +++ b/recipes/crosstool-ng/gcc-versions.inc
> @@ -9,11 +9,15 @@ CT_KERNEL_VERSION		= "${MACHINE_CT_KERNEL_VERSION}"
>  CT_KERNEL_VERSION:sdk-cross	= "${SDK_CT_KERNEL_VERSION}"
>  CT_KERNEL_VERSION:sdk		= "${SDK_CT_KERNEL_VERSION}"
>  CT_KERNEL_VERSION:native	= "${BUILD_CT_KERNEL_VERSION}"
> +USE_KERNEL_VERSION_MACHINE = "toolchain_kernel_version_machine"
> +USE_KERNEL_VERSION_MACHINE:sdk-cross = ""
> +USE_KERNEL_VERSION_MACHINE:native = ""
> +USE_KERNEL_VERSION_MACHINE:sdk = ""
>  MACHINE_CT_KERNEL_VERSION	= "${USE_toolchain_kernel_version_machine}"
>  SDK_CT_KERNEL_VERSION		= "${USE_toolchain_kernel_version_sdk}"
>  SDK_CT_KERNEL_VERSION:TARGET_OS_mingw32 = "${USE_toolchain_w32api_version}"
>  BUILD_CT_KERNEL_VERSION		= "${USE_toolchain_kernel_version_build}"
> -RECIPE_FLAGS += "toolchain_kernel_version_machine toolchain_kernel_version_sdk \
> +RECIPE_FLAGS += " ${USE_KERNEL_VERSION_MACHINE} toolchain_kernel_version_sdk \
>  	toolchain_kernel_version_build toolchain_w32api_version"
>  
>  CT_LIBC_GLIBC_MIN_KERNEL_VERSION = "${USE_toolchain_min_kernel_machine}"

Merged to master, 3.1 and 3.0 branches.

/Esben

Patch

diff --git a/recipes/crosstool-ng/gcc-versions.inc b/recipes/crosstool-ng/gcc-versions.inc
index e3f941b..1c339e3 100644
--- a/recipes/crosstool-ng/gcc-versions.inc
+++ b/recipes/crosstool-ng/gcc-versions.inc
@@ -9,11 +9,15 @@  CT_KERNEL_VERSION		= "${MACHINE_CT_KERNEL_VERSION}"
 CT_KERNEL_VERSION:sdk-cross	= "${SDK_CT_KERNEL_VERSION}"
 CT_KERNEL_VERSION:sdk		= "${SDK_CT_KERNEL_VERSION}"
 CT_KERNEL_VERSION:native	= "${BUILD_CT_KERNEL_VERSION}"
+USE_KERNEL_VERSION_MACHINE = "toolchain_kernel_version_machine"
+USE_KERNEL_VERSION_MACHINE:sdk-cross = ""
+USE_KERNEL_VERSION_MACHINE:native = ""
+USE_KERNEL_VERSION_MACHINE:sdk = ""
 MACHINE_CT_KERNEL_VERSION	= "${USE_toolchain_kernel_version_machine}"
 SDK_CT_KERNEL_VERSION		= "${USE_toolchain_kernel_version_sdk}"
 SDK_CT_KERNEL_VERSION:TARGET_OS_mingw32 = "${USE_toolchain_w32api_version}"
 BUILD_CT_KERNEL_VERSION		= "${USE_toolchain_kernel_version_build}"
-RECIPE_FLAGS += "toolchain_kernel_version_machine toolchain_kernel_version_sdk \
+RECIPE_FLAGS += " ${USE_KERNEL_VERSION_MACHINE} toolchain_kernel_version_sdk \
 	toolchain_kernel_version_build toolchain_w32api_version"
 
 CT_LIBC_GLIBC_MIN_KERNEL_VERSION = "${USE_toolchain_min_kernel_machine}"