[Feature #19741] Add yarp to builds

Add yarp to common.mk and windows builds to enable us to run yarp correctly with CI.
ruby · Jun 21, 2023 · d53e1f4 · d53e1f4
1 parent 03f1a6c
commit d53e1f4
Show file tree

Hide file tree

Showing 6 changed files with 1,229 additions and 2 deletions.
diff --git a/common.mk b/common.mk
diff --git a/inits.c b/inits.c
@@ -80,6 +80,7 @@ rb_call_inits(void)
     CALL(ast);
     CALL(gc_stress);
     CALL(shape);
+    CALL(YARP);
 
     // enable builtin loading
     CALL(builtin);

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

diff --git a/tool/leaked-globals b/tool/leaked-globals
@@ -55,7 +55,7 @@ IO.foreach("|#{NM} #{ARGV.join(' ')}") do |line|
   next unless /[A-TV-Z]/ =~ t
   next unless n.sub!(/^#{SYMBOL_PREFIX}/o, "")
   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)
   puts col.fail("leaked") if count.zero?
   count += 1

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

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
@@ -514,6 +514,8 @@ VCSUP = rem
 !endif
 ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc
 
+YARP_BUILD_DIR = $(MAKEDIR)/yarp
+
 MESSAGE_BEGIN = @(for %I in (
 MESSAGE_END = ) do @echo.%~I)
 ECHO_BEGIN = @echo.
@@ -1278,6 +1280,15 @@ $(ruby_pc): $(RBCONFIG)
 	$(ECHO) assembling $(<:\=/)
 	$(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:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)