Re: [PATCH] ruby-native: fix building with gcc 4.4.x

[Philip Balister <philip@balister.org>]

On 01/22/2010 03:30 AM, Marcin Juszkiewicz wrote:
> From: Marcin Juszkiewicz<marcin@buglabs.net>
>
> Looks like gcc 4.4.x do not like the way Ruby programmers used
> preprocessor.
>
> This change is not present in .dev due to different versions of Ruby.
>
> Signed-off-by: Marcin Juszkiewicz<marcin@buglabs.net>

Acked-by: Philip Balister <philip@balister.org>


> ---
>   recipes/ruby/files/gcc44.patch    |   19 +++++++++++++++++++
>   recipes/ruby/ruby-native_1.8.5.bb |    5 +++++
>   2 files changed, 24 insertions(+), 0 deletions(-)
>   create mode 100644 recipes/ruby/files/gcc44.patch
>
> diff --git a/recipes/ruby/files/gcc44.patch b/recipes/ruby/files/gcc44.patch
> new file mode 100644
> index 0000000..dc5a608
> --- /dev/null
> +++ b/recipes/ruby/files/gcc44.patch
> @@ -0,0 +1,19 @@
> +---
> + math.c |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +--- ruby-1.8.5.orig/math.c
> ++++ ruby-1.8.5/math.c
> +@@ -32,11 +32,11 @@ domain_check(x, msg)
> + 	    rb_sys_fail(msg);
> + 	}
> + 	if (isnan(x)) {
> + #if defined(EDOM)
> + 	    errno = EDOM;
> +-#elif define(ERANGE)
> ++#elif defined(ERANGE)
> + 	    errno = ERANGE;
> + #endif
> + 	    continue;
> + 	}
> + 	break;
> diff --git a/recipes/ruby/ruby-native_1.8.5.bb b/recipes/ruby/ruby-native_1.8.5.bb
> index e4d2a33..f35363d 100644
> --- a/recipes/ruby/ruby-native_1.8.5.bb
> +++ b/recipes/ruby/ruby-native_1.8.5.bb
> @@ -1,2 +1,7 @@
>   require ruby.inc
>   inherit native
> +
> +PR = "r1"
> +
> +SRC_URI += " file://gcc44.patch;patch=1 "
> +