[meta-java][PATCH v2] openjdk-8: ignore wrong GCCVERSION-flag

[meta-java][PATCH v2] openjdk-8: ignore wrong GCCVERSION-flag

[Sven Ebenfeld]

During my recipe parsing, GCCVERSION in the cross case seems to
be 'l' this leads to a ValueError during recipe parsing. Therefore
check type before trying to parse the version flag.

Signed-off-by: Sven Ebenfeld <sven.ebenfeld@vaillant-group.com>
---
 recipes-core/openjdk/openjdk-8-common.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index 089f907..33b7909 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -271,10 +271,12 @@ def version_specific_cflags(d):
         # doesn't work anyway.
         version = d.getVar('GCCVERSION', expand=True)[0]
 
-    if int(version) >= 4:
+    if version.isdigit() and int(version) >= 4:
         extraflags = d.getVar('FLAGS_GCC%d' % int(version), True)
 
-    return ''.join(extraflags)
+    if extraflags:
+        return ''.join(extraflags)
+    return ''
 
 CFLAGS_append = " ${@version_specific_cflags(d)}"
 CXXFLAGS_append = " ${@version_specific_cflags(d)}"
-- 
1.9.1

Re: [meta-java][PATCH v2] openjdk-8: ignore wrong GCCVERSION-flag

[Fabio Berton]

It works for me.
I tested using host gcc 4.9.x and oe-core krogoth.

Without this patch bitbake fail with ExpansionError during parsing.

On Thu, Jul 21, 2016 at 10:09 AM, Sven Ebenfeld <
sven.ebenfeld@vaillant-group.com> wrote:

> During my recipe parsing, GCCVERSION in the cross case seems to
> be 'l' this leads to a ValueError during recipe parsing. Therefore
> check type before trying to parse the version flag.
>
> Signed-off-by: Sven Ebenfeld <sven.ebenfeld@vaillant-group.com>
> ---
>  recipes-core/openjdk/openjdk-8-common.inc | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-core/openjdk/openjdk-8-common.inc
> b/recipes-core/openjdk/openjdk-8-common.inc
> index 089f907..33b7909 100644
> --- a/recipes-core/openjdk/openjdk-8-common.inc
> +++ b/recipes-core/openjdk/openjdk-8-common.inc
> @@ -271,10 +271,12 @@ def version_specific_cflags(d):
>          # doesn't work anyway.
>          version = d.getVar('GCCVERSION', expand=True)[0]
>
> -    if int(version) >= 4:
> +    if version.isdigit() and int(version) >= 4:
>          extraflags = d.getVar('FLAGS_GCC%d' % int(version), True)
>
> -    return ''.join(extraflags)
> +    if extraflags:
> +        return ''.join(extraflags)
> +    return ''
>
>  CFLAGS_append = " ${@version_specific_cflags(d)}"
>  CXXFLAGS_append = " ${@version_specific_cflags(d)}"
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>