1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Feature #19741] Add yarp to builds

Browse Source 
Add yarp to common.mk and windows builds to enable us to run yarp
correctly with CI.
This commit is contained in:
Jemma Issroff 2023-06-20 11:48:12 -04:00 committed by Takashi Kokubun
parent 03f1a6c4c5
commit d53e1f42ff
Notes: git 2023-06-21 18:26:03 +00:00 
Merged: https://github.com/ruby/ruby/pull/7964
6 changed files with 1229 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1214
common.mk
View File

File diff suppressed because it is too large Load Diff

1
inits.c
View File

@ -80,6 +80,7 @@ rb_call_inits(void)
CALL(ast); CALL(ast);
CALL(gc_stress); CALL(gc_stress);
CALL(shape); CALL(shape);
CALL(YARP);
// enable builtin loading // enable builtin loading
CALL(builtin); CALL(builtin);

1
template/Makefile.in
View File

@ -107,6 +107,7 @@ YJIT_LIBS=@YJIT_LIBS@
YJIT_OBJ=@YJIT_OBJ@ YJIT_OBJ=@YJIT_OBJ@
YJIT_LIBOBJ = $(YJIT_LIBS:.a=.@OBJEXT@) YJIT_LIBOBJ = $(YJIT_LIBS:.a=.@OBJEXT@)
CARGO_TARGET_DIR=@abs_top_builddir@/yjit/target CARGO_TARGET_DIR=@abs_top_builddir@/yjit/target
YARP_BUILD_DIR=@abs_top_builddir@/yarp
CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@ CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
EXE_LDFLAGS = $(LDFLAGS) EXE_LDFLAGS = $(LDFLAGS)

2
tool/leaked-globals
View File

@ -55,7 +55,7 @@ IO.foreach("|#{NM} #{ARGV.join(' ')}") do |line|
next unless /[A-TV-Z]/ =~ t next unless /[A-TV-Z]/ =~ t
next unless n.sub!(/^#{SYMBOL_PREFIX}/o, "") next unless n.sub!(/^#{SYMBOL_PREFIX}/o, "")
next if n.include?(".") next if n.include?(".")
next if /\A(?:Init_|InitVM_|RUBY_|ruby_|rb_|[Oo]nig|dln_|coroutine_)/ =~ n next if /\A(?:Init_|InitVM_|RUBY_|ruby_|rb_|yp_|[Oo]nig|dln_|coroutine_)/ =~ n
next if REPLACE.include?(n) next if REPLACE.include?(n)
puts col.fail("leaked") if count.zero? puts col.fail("leaked") if count.zero?
count += 1 count += 1

2
tool/update-deps
View File

@ -173,7 +173,7 @@ def in_makefile(target, source)
target = target.to_s target = target.to_s
source = source.to_s source = source.to_s
case target case target
when %r{\A[^/]*\z}, %r{\Acoroutine/} when %r{\A[^/]*\z}, %r{\Acoroutine/}, %r{\Ayarp/}
target2 = "#{target.sub(/\.o\z/, '.$(OBJEXT)')}" target2 = "#{target.sub(/\.o\z/, '.$(OBJEXT)')}"
case source case source
when *FILES_IN_SOURCE_DIRECTORY then source2 = "$(top_srcdir)/#{source}" when *FILES_IN_SOURCE_DIRECTORY then source2 = "$(top_srcdir)/#{source}"

11
win32/Makefile.sub
View File

@ -514,6 +514,8 @@ VCSUP = rem
!endif !endif
ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc
YARP_BUILD_DIR = $(MAKEDIR)/yarp
MESSAGE_BEGIN = @(for %I in ( MESSAGE_BEGIN = @(for %I in (
MESSAGE_END = ) do @echo.%~I) MESSAGE_END = ) do @echo.%~I)
ECHO_BEGIN = @echo. ECHO_BEGIN = @echo.
@ -1278,6 +1280,15 @@ $(ruby_pc): $(RBCONFIG)
$(ECHO) assembling $(<:\=/) $(ECHO) assembling $(<:\=/)
$(Q) $(AS) $(ASFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/) $(Q) $(AS) $(ASFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/)
{$(srcdir)/yarp}.c.obj:
$(ECHO) compiling $(<:\=/)
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
{$(srcdir)/yarp/enc}.c.obj:
$(ECHO) compiling $(<:\=/)
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
{$(srcdir)/yarp/util}.c.obj:
$(ECHO) compiling $(<:\=/)
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
{$(srcdir)/enc/trans}.c.obj: {$(srcdir)/enc/trans}.c.obj:
$(ECHO) compiling $(<:\=/) $(ECHO) compiling $(<:\=/)
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)