Re: ruby2.1 FTBFS

[Thorsten Glaser]

Andreas Schwab dixit:

>Please try this patch.

Thanks, this works. Uploaded to “unreleased”.

Antonio, Zeha, please apply this patch to the Debian source
package of ruby2.1 some time. Also, you or Andreas should
forward it upstream.

Thanks,
//mirabilos
-- 
“It is inappropriate to require that a time represented as
 seconds since the Epoch precisely represent the number of
 seconds between the referenced time and the Epoch.”
        -- IEEE Std 1003.1b-1993 (POSIX) Section B.2.2.2
diff -Nru ruby2.1-2.1.4/debian/changelog ruby2.1-2.1.4/debian/changelog
--- ruby2.1-2.1.4/debian/changelog      2014-10-29 15:15:29.000000000 +0000
+++ ruby2.1-2.1.4/debian/changelog      2014-11-23 19:51:15.000000000 +0000
@@ -1,3 +1,9 @@
+ruby2.1 (2.1.4-1+m68k.1) unreleased; urgency=medium
+
+  * Apply m68k patch from Andreas Schwab
+
+ -- Thorsten Glaser <t...@mirbsd.de>  Sun, 23 Nov 2014 19:50:30 +0000
+
 ruby2.1 (2.1.4-1) unstable; urgency=high
 
   * New upstream version
diff -Nru ruby2.1-2.1.4/debian/patches/m68k-fix 
ruby2.1-2.1.4/debian/patches/m68k-fix
--- ruby2.1-2.1.4/debian/patches/m68k-fix       1970-01-01 00:00:00.000000000 
+0000
+++ ruby2.1-2.1.4/debian/patches/m68k-fix       2014-11-23 19:49:45.000000000 
+0000
@@ -0,0 +1,37 @@
+From sch...@suse.de Mon Oct 20 11:52:21 2014
+From: Andreas Schwab <sch...@suse.de>
+Message-ID: <mvmy4sbvuia....@hawking.suse.de>
+X-Spam-Status: No, hits=0.000000 required=0.900000
+To: Thorsten Glaser <t...@mirbsd.de>
+Cc: debian-68k@lists.debian.org
+Date: Mon, 20 Oct 2014 13:41:01 +0200
+Subject: Re: ruby2.1 FTBFS
+
+Please try this patch.
+
+Andreas.
+
+--- a/gc.c
++++ b/gc.c
+@@ -3497,8 +3497,8 @@ mark_current_machine_context(rb_objspace
+     rb_gc_mark_locations(th->machine.register_stack_start, 
th->machine.register_stack_end);
+ #endif
+ #if defined(__mc68000__)
+-    mark_locations_array(objspace, (VALUE*)((char*)STACK_END + 2),
+-                       (STACK_START - STACK_END));
++    rb_gc_mark_locations((VALUE*)((char*)stack_start + 2),
++                       (VALUE*)((char*)stack_end - 2));
+ #endif
+ }
+ 
+@@ -3513,6 +3513,10 @@ rb_gc_mark_machine_stack(rb_thread_t *th
+ #ifdef __ia64
+     rb_gc_mark_locations(th->machine.register_stack_start, 
th->machine.register_stack_end);
+ #endif
++#if defined(__mc68000__)
++    rb_gc_mark_locations((VALUE*)((char*)stack_start + 2),
++                       (VALUE*)((char*)stack_end - 2));
++#endif
+ }
+ 
+ void
diff -Nru ruby2.1-2.1.4/debian/patches/series 
ruby2.1-2.1.4/debian/patches/series
--- ruby2.1-2.1.4/debian/patches/series 2014-10-29 15:57:43.000000000 +0000
+++ ruby2.1-2.1.4/debian/patches/series 2014-11-23 19:48:37.000000000 +0000
@@ -1 +1,2 @@
 debian-changes
+m68k-fix