On Sat, Jan 10, 2015 at 09:32:41AM -0800, Ken Takata wrote: > Hi Ike, > > 2015/1/8 Thu 0:01:18 UTC+9 Ike wrote: > > Since version 2.2.0 of ruby building vim with dynamic ruby fails. > ... > > if_ruby.c:(.text+0x8fa): undefined reference to `rb_check_type' > ... > > if_ruby.c:(.text+0xbc3): undefined reference to > > `rb_gc_writebarrier_unprotect' > > > Reproduced with MSVC10. > Can you try the attached patch? > > Regards, > Ken Takata > > -- > -- > You received this message from the "vim_dev" maillist. > Do not top-post! Type your reply below the text you are replying to. > For more information, visit http://www.vim.org/maillist.php > > --- > You received this message because you are subscribed to the Google Groups > "vim_dev" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > For more options, visit https://groups.google.com/d/optout.
> # HG changeset patch
> # Parent 80f787a1e4be59822b1c23010a44507ed0fb2fb0
> diff --git a/src/if_ruby.c b/src/if_ruby.c
> --- a/src/if_ruby.c
> +++ b/src/if_ruby.c
> @@ -96,11 +96,15 @@
> # define rb_num2int rb_num2int_stub
> #endif
>
> -#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 21
> +#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER == 21
> /* Ruby 2.1 adds new GC called RGenGC and RARRAY_PTR uses
> * rb_gc_writebarrier_unprotect_promoted if USE_RGENGC */
> # define rb_gc_writebarrier_unprotect_promoted
> rb_gc_writebarrier_unprotect_promoted_stub
> #endif
> +#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 22
> +# define rb_gc_writebarrier_unprotect rb_gc_writebarrier_unprotect_stub
> +# define rb_check_type rb_check_type_stub
> +#endif
>
> #include <ruby.h>
> #ifdef RUBY19_OR_LATER
> @@ -180,7 +184,9 @@ static void ruby_vim_init(void);
> */
> # define rb_assoc_new dll_rb_assoc_new
> # define rb_cObject (*dll_rb_cObject)
> -# define rb_check_type dll_rb_check_type
> +# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER < 22
> +# define rb_check_type dll_rb_check_type
> +# endif
> # define rb_class_path dll_rb_class_path
> # define rb_data_object_alloc dll_rb_data_object_alloc
> # define rb_define_class_under dll_rb_define_class_under
> @@ -382,7 +388,11 @@ static void* (*ruby_process_options)(int
> # endif
>
> # if defined(USE_RGENGC) && USE_RGENGC
> +# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER == 21
> static void (*dll_rb_gc_writebarrier_unprotect_promoted)(VALUE);
> +# else
> +static void (*dll_rb_gc_writebarrier_unprotect)(VALUE obj);
> +# endif
> # endif
>
> # if defined(RUBY19_OR_LATER) && !defined(PROTO)
> @@ -420,10 +430,24 @@ VALUE rb_num2ulong(VALUE x)
>
> /* Do not generate a prototype here, VALUE isn't always defined. */
> # if defined(USE_RGENGC) && USE_RGENGC && !defined(PROTO)
> +# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER == 21
> void rb_gc_writebarrier_unprotect_promoted_stub(VALUE obj)
> {
> dll_rb_gc_writebarrier_unprotect_promoted(obj);
> }
> +# else
> +void rb_gc_writebarrier_unprotect_stub(VALUE obj)
> +{
> + dll_rb_gc_writebarrier_unprotect(obj);
> +}
> +# endif
> +# endif
> +
> +# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 22
> +void rb_check_type_stub(VALUE v, int i)
> +{
> + dll_rb_check_type(v, i);
> +}
> # endif
>
> static HINSTANCE hinstRuby = NULL; /* Instance of ruby.dll */
> @@ -542,7 +566,11 @@ static struct
> {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
> # endif
> # if defined(USE_RGENGC) && USE_RGENGC
> +# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER == 21
> {"rb_gc_writebarrier_unprotect_promoted",
> (RUBY_PROC*)&dll_rb_gc_writebarrier_unprotect_promoted},
> +# else
> + {"rb_gc_writebarrier_unprotect",
> (RUBY_PROC*)&dll_rb_gc_writebarrier_unprotect},
> +# endif
> # endif
> {"", NULL},
> };
I can confirm compiling works with gcc 4.9.2 and ruby 2.2.0
simple test by running ":ruby print 'test'" did work when ruby is
installed.
thanks
--
Ike
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
pgpedpTBetIl_.pgp
Description: PGP signature
