* [STABLE][PATCH] ruby-native: fix building with gcc 4.4.x
@ 2010-01-22 6:37 Marcin Juszkiewicz
2010-01-22 6:52 ` Khem Raj
0 siblings, 1 reply; 5+ messages in thread
From: Marcin Juszkiewicz @ 2010-01-22 6:37 UTC (permalink / raw)
To: openembedded-devel
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>
---
recipes/ruby/files/gcc44.patch | 23 +++++++++++++++++++++++
recipes/ruby/ruby-native_1.8.5.bb | 5 +++++
2 files changed, 28 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..b8f8ee4
--- /dev/null
+++ b/recipes/ruby/files/gcc44.patch
@@ -0,0 +1,23 @@
+---
+ math.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- ruby-1.8.5.orig/math.c
++++ ruby-1.8.5/math.c
+@@ -32,13 +32,15 @@ domain_check(x, msg)
+ rb_sys_fail(msg);
+ }
+ if (isnan(x)) {
+ #if defined(EDOM)
+ errno = EDOM;
+-#elif define(ERANGE)
++#else
++#if define(ERANGE)
+ errno = ERANGE;
+ #endif
++#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 "
+
--
1.6.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [STABLE][PATCH] ruby-native: fix building with gcc 4.4.x
2010-01-22 6:37 [STABLE][PATCH] ruby-native: fix building with gcc 4.4.x Marcin Juszkiewicz
@ 2010-01-22 6:52 ` Khem Raj
2010-01-22 8:30 ` [PATCH] " Marcin Juszkiewicz
0 siblings, 1 reply; 5+ messages in thread
From: Khem Raj @ 2010-01-22 6:52 UTC (permalink / raw)
To: openembedded-devel
On Thu, Jan 21, 2010 at 10:37 PM, Marcin Juszkiewicz
<marcin@juszkiewicz.com.pl> 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>
> ---
> recipes/ruby/files/gcc44.patch | 23 +++++++++++++++++++++++
> recipes/ruby/ruby-native_1.8.5.bb | 5 +++++
> 2 files changed, 28 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..b8f8ee4
> --- /dev/null
> +++ b/recipes/ruby/files/gcc44.patch
> @@ -0,0 +1,23 @@
> +---
> + math.c | 4 +++-
> + 1 file changed, 3 insertions(+), 1 deletion(-)
> +
> +--- ruby-1.8.5.orig/math.c
> ++++ ruby-1.8.5/math.c
> +@@ -32,13 +32,15 @@ domain_check(x, msg)
> + rb_sys_fail(msg);
> + }
> + if (isnan(x)) {
> + #if defined(EDOM)
> + errno = EDOM;
> +-#elif define(ERANGE)
^^^^^^
this is the problem, it should be '#elif defined' and then it should work.
Thx
-Khem
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ruby-native: fix building with gcc 4.4.x
2010-01-22 6:52 ` Khem Raj
@ 2010-01-22 8:30 ` Marcin Juszkiewicz
2010-01-22 15:05 ` Philip Balister
0 siblings, 1 reply; 5+ messages in thread
From: Marcin Juszkiewicz @ 2010-01-22 8:30 UTC (permalink / raw)
To: openembedded-devel
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>
---
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 "
+
--
1.6.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] ruby-native: fix building with gcc 4.4.x
2010-01-22 8:30 ` [PATCH] " Marcin Juszkiewicz
@ 2010-01-22 15:05 ` Philip Balister
2010-01-22 16:09 ` Khem Raj
0 siblings, 1 reply; 5+ messages in thread
From: Philip Balister @ 2010-01-22 15:05 UTC (permalink / raw)
To: openembedded-devel
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 "
> +
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ruby-native: fix building with gcc 4.4.x
2010-01-22 15:05 ` Philip Balister
@ 2010-01-22 16:09 ` Khem Raj
0 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2010-01-22 16:09 UTC (permalink / raw)
To: openembedded-devel
On Fri, Jan 22, 2010 at 7:05 AM, Philip Balister <philip@balister.org> wrote:
> 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>
>
Acked-by: Khem Raj <raj.khem@gmail.com>
>
>> ---
>> 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 "
>> +
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-01-22 16:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-22 6:37 [STABLE][PATCH] ruby-native: fix building with gcc 4.4.x Marcin Juszkiewicz
2010-01-22 6:52 ` Khem Raj
2010-01-22 8:30 ` [PATCH] " Marcin Juszkiewicz
2010-01-22 15:05 ` Philip Balister
2010-01-22 16:09 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.