kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

fix macos build 

note that this is not a security fix, but recognized as critical build problem.
[Backport #17777]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2021-05-09 16:11:52 +00:00
parent 1b59a4dc76
commit 5df653caaa
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/fiddle/closure.c
View File

@ -14,10 +14,7 @@ typedef struct {
} fiddle_closure;
#if defined(USE_FFI_CLOSURE_ALLOC)
#elif defined(__OpenBSD__) || defined(__APPLE__) || defined(__linux__)
# define USE_FFI_CLOSURE_ALLOC 0
#elif defined(RUBY_LIBFFI_MODVERSION) && RUBY_LIBFFI_MODVERSION < 3000005 && \
(defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_AMD64))
#elif !defined(HAVE_FFI_CLOSURE_ALLOC)
# define USE_FFI_CLOSURE_ALLOC 0
#else
# define USE_FFI_CLOSURE_ALLOC 1

13
ext/fiddle/extconf.rb
View File

@ -13,7 +13,7 @@ if ! bundle
if have_header(ffi_header = 'ffi.h')
true
elsif have_header(ffi_header = 'ffi/ffi.h')
$defs.push(format('-DUSE_HEADER_HACKS'))
$defs.push('-DUSE_HEADER_HACKS')
true
end and (have_library('ffi') || have_library('libffi'))
end or
@ -116,6 +116,15 @@ if ver
ver = ver.gsub(/-rc\d+/, '') # If ver contains rc version, just ignored.
ver = (ver.split('.') + [0,0])[0,3]
$defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver }})
warn "libffi_version: #{ver.join('.')}"
end
case
when $mswin, $mingw, (ver && (ver <=> [3, 2]) >= 0)
$defs << "-DUSE_FFI_CLOSURE_ALLOC=1"
when (ver && (ver <=> [3, 2]) < 0)
else
have_func('ffi_closure_alloc', ffi_header)
end
have_header 'sys/mman.h'
@ -142,7 +151,7 @@ types.each do |type, signed|
if /^\#define\s+SIZEOF_#{type}\s+(SIZEOF_(.+)|\d+)/ =~ config
if size = $2 and size != 'VOIDP'
size = types.fetch(size) {size}
$defs << format("-DTYPE_%s=TYPE_%s", signed||type, size)
$defs << "-DTYPE_#{signed||type}=TYPE_#{size}"
end
if signed
check_signedness(type.downcase, "stddef.h")

10
version.h
View File

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.6.7"
#define RUBY_RELEASE_DATE "2021-04-05"
#define RUBY_PATCHLEVEL 197
#define RUBY_VERSION "2.6.8"
#define RUBY_RELEASE_DATE "2021-05-10"
#define RUBY_PATCHLEVEL 198
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 4
#define RUBY_RELEASE_DAY 5
#define RUBY_RELEASE_MONTH 5
#define RUBY_RELEASE_DAY 10
#include "ruby/version.h"

4
vm.c
View File

@ -2263,6 +2263,8 @@ free_loading_table_entry(st_data_t key, st_data_t value, st_data_t arg)
return ST_DELETE;
}
extern void rb_native_mutex_destroy(rb_nativethread_lock_t *lock);
int
ruby_vm_destruct(rb_vm_t *vm)
{
@ -2486,7 +2488,7 @@ rb_execution_context_mark(const rb_execution_context_t *ec)
rb_gc_mark_machine_stack(ec);
rb_gc_mark_locations((VALUE *)&ec->machine.regs,
(VALUE *)(&ec->machine.regs) +
sizeof(ec->machine.regs) / sizeof(VALUE));
sizeof(ec->machine.regs) / (sizeof(VALUE)));
}
RUBY_MARK_UNLESS_NULL(ec->errinfo);