[GR-59808] Build libtruffleposix and spawn-helper in their own project so they can be used by bootstrap ruby, used for building core extensions

PullRequest: truffleruby/4560

Author: eregon

mx.truffleruby/suite.py

@@ -220,6 +220,31 @@
             "ldflags": ["-pthread"],
         },
 
+        "org.truffleruby.libtruffleposix": {
+            "dir": "src/main/c/truffleposix",
+            "native": "shared_lib",
+            "deliverable": "truffleposix",
+            "buildDependencies": [
+                "TRUFFLERUBY_GRAALVM_SUPPORT_PLATFORM_AGNOSTIC",
+            ],
+            "cflags": ["-g", "-O3", "-std=c99", "-Wall", "-Werror", "-pthread", "-I<path:TRUFFLERUBY_GRAALVM_SUPPORT_PLATFORM_AGNOSTIC>/lib/cext/include"],
+            "ldflags": ["-pthread"],
+            "os": {
+                "linux": {
+                    "ldlibs": ["-lrt"],
+                },
+                "<others>": {
+                },
+            },
+        },
+
+        "org.truffleruby.spawnhelper": {
+            "dir": "src/main/c/spawn-helper",
+            "native": "executable",
+            "deliverable": "spawn-helper",
+            "cflags": ["-g", "-O3", "-std=c99", "-Wall", "-Werror"],
+        },
+
         "org.prism.libprism": {
             "class": "YARPNativeProject",
             "dir": "src/main/c/yarp",
@@ -404,8 +429,6 @@
             },
             "output": ".",
             "results": [
-                "src/main/c/spawn-helper/spawn-helper",
-                "src/main/c/truffleposix/<lib:truffleposix>",
                 "src/main/c/cext/<lib:truffleruby>",
                 "src/main/c/cext-trampoline/<lib:trufflerubytrampoline>",
                 "src/main/c/bigdecimal/<extsuffix:bigdecimal>",
@@ -750,12 +773,15 @@
                 ],
                 "lib/cext/": [
                     "file:lib/cext/*.rb",
-                    # libtruffleposix is handled specially in posix.rb to avoid a cyclic dependency between org.truffleruby.cext and TRUFFLERUBY-BOOTSTRAP-LAUNCHER
                     "dependency:org.truffleruby.librubysignal",
+                    "dependency:org.truffleruby.libtruffleposix",
                 ],
                 "lib/cext/include/": [
                     "file:lib/cext/include/*",
                 ],
+                "lib/truffle/": [
+                    "dependency:org.truffleruby.spawnhelper",
+                ],
             },
             "maven": False,
         },
@@ -805,10 +831,10 @@
                     "dependency:org.prism.libprism.for.gem/build/<lib:prism>",
                 ],
                 "lib/cext/": [
-                    "dependency:org.truffleruby.cext/src/main/c/truffleposix/<lib:truffleposix>",
+                    "dependency:org.truffleruby.librubysignal",
+                    "dependency:org.truffleruby.libtruffleposix",
                     "dependency:org.truffleruby.cext/src/main/c/cext/<lib:truffleruby>",
                     "dependency:org.truffleruby.cext/src/main/c/cext-trampoline/<lib:trufflerubytrampoline>",
-                    "dependency:org.truffleruby.librubysignal",
                 ],
                 # Create the complete files to let RubyGems know the gems are fully built and can be activated
                 "lib/gems/extensions/<cruby_arch>-<os>/<truffleruby_abi_version>/debug-1.9.2/gem.build_complete": "string:",
@@ -838,7 +864,7 @@
                     "dependency:org.truffleruby.cext/src/main/c/rbconfig-sizeof/<extsuffix:sizeof>",
                 ],
                 "lib/truffle/": [
-                    "dependency:org.truffleruby.cext/src/main/c/spawn-helper/spawn-helper",
+                    "dependency:org.truffleruby.spawnhelper",
                 ],
             },
             "license": [
@@ -1073,7 +1099,7 @@
                 "TRUFFLERUBY",
                 "TRUFFLERUBY-RESOURCES",
             ],
-            "description" : "Truffle TCK provider for Ruby language.",
+            "description": "Truffle TCK provider for Ruby language.",
             "license": ["EPL-2.0"],
             "maven": {
                 "artifactId": "ruby-truffle-tck",

src/main/c/Makefile

@@ -17,16 +17,14 @@ endif
 ROOT := $(realpath ../../..)
 RUBY := $(TRUFFLERUBY_BOOTSTRAP_LAUNCHER)
 
-TRUFFLE_POSIX := truffleposix/libtruffleposix.$(SOEXT)
-SPAWN_HELPER := spawn-helper/spawn-helper
 TRAMPOLINE := cext-trampoline/libtrufflerubytrampoline.$(SOEXT)
 
 RUBY_HEADERS := $(shell find $(ROOT)/lib/cext/include -name '*.h')
 CEXT_C_FILES := $(shell find cext -name '*.c')
 RBCONFIG := $(ROOT)/lib/truffle/rbconfig.rb
 MKMF := $(ROOT)/lib/mri/mkmf.rb
 LIBTRUFFLERUBY = cext/libtruffleruby.$(SOEXT)
-BASIC_DEPS := Makefile $(SPAWN_HELPER) $(TRUFFLE_POSIX) $(RUBY_HEADERS)
+BASIC_DEPS := Makefile $(RUBY_HEADERS)
 BASIC_EXTCONF_DEPS := $(BASIC_DEPS) $(RBCONFIG) $(MKMF)
 # C extensions link against libtruffleruby (and might do have_func() checks against it), so it needs to be there before.
 # However, if libtruffleruby is recompiled, there is no need to rebuild C extensions, so it's a order-only-prerequisite.
@@ -42,10 +40,7 @@ all: $(TRAMPOLINE) $(LIBTRUFFLERUBY) openssl/openssl.$(DLEXT) zlib/zlib.$(DLEXT)
 			bigdecimal/bigdecimal.$(DLEXT) date/date_core.$(DLEXT) io-console/console.$(DLEXT) etc/etc.$(DLEXT) \
 			rbconfig-sizeof/sizeof.$(DLEXT) debug/debug.$(DLEXT) rbs/rbs_extension.$(DLEXT)
 
-clean: clean_cexts clean_truffleposix clean_trampoline
-
-clean_truffleposix:
-	$(Q) rm -f $(TRUFFLE_POSIX) truffleposix/*.o
+clean: clean_cexts clean_trampoline
 
 clean_trampoline:
 	$(Q) rm -f $(TRAMPOLINE) cext-trampoline/trampoline.c cext/wrappers.c cext-trampoline/*.o
@@ -66,14 +61,6 @@ clean_cexts:
 	$(Q) rm -f debug/Makefile debug/*.o debug/debug.$(DLEXT)
 	$(Q) rm -f rbs/Makefile rbs/*.o rbs/rbs_extension.$(DLEXT)
 
-# spawn-helper
-$(SPAWN_HELPER): spawn-helper/Makefile spawn-helper/spawn-helper.c
-	$(Q) cd spawn-helper && $(MAKE)
-
-# truffleposix
-$(TRUFFLE_POSIX): truffleposix/Makefile truffleposix/truffleposix.c
-	$(Q) cd truffleposix && $(MAKE)
-
 # cext-trampoline
 cext-trampoline/trampoline.c: $(CEXT_C_FILES) $(BASIC_DEPS) $(ROOT)/tool/generate-cext-trampoline.rb
 	$(Q) cd $(ROOT) && $(RUBY) tool/generate-cext-trampoline.rb

src/main/c/spawn-helper/Makefile

@@ -39,13 +39,7 @@ def resolve
   end
 
   LIBTRUFFLEPOSIX = LazyLibrary.new do
-    home = Truffle::Boot.ruby_home
-    if Truffle::Boot.get_option 'building-core-cexts'
-      repo = Truffle::System.get_java_property 'truffleruby.repository'
-      libtruffleposix = "#{repo}/src/main/c/truffleposix/libtruffleposix.#{Truffle::Platform::SOEXT}"
-    else
-      libtruffleposix = "#{home}/lib/cext/libtruffleposix.#{Truffle::Platform::SOEXT}"
-    end
+    libtruffleposix = "#{Truffle::Boot.ruby_home}/lib/cext/libtruffleposix.#{Truffle::Platform::SOEXT}"
     Primitive.interop_eval_nfi "load '#{libtruffleposix}'"
   end
 

src/main/c/spawn-helper/spawn-helper.c renamed to src/main/c/spawn-helper/src/spawn-helper.c

@@ -570,6 +570,7 @@ def posix_spawnp(command, args, env_array, options)
         if use_helper
           # Go through spawn-helper to change the working dir and then execve()
           spawn_helper = "#{Truffle::Boot.ruby_home}/lib/truffle/spawn-helper"
+          raise "#{spawn_helper} does not exist!" unless File.exist?(spawn_helper)
           cwd = chdir || Dir.pwd
           args = [spawn_helper, cwd, command, *args]
           command = spawn_helper