Install gem extension libraries in the GEM_HOME

instead of ruby installation directory.

Author: kateinoigakukun

lib/ruby_wasm/build/product/crossruby.rb

@@ -42,7 +42,7 @@ def make_args(crossruby)
       make_args
     end
 
-    def build(executor, crossruby)
+    def build(executor, crossruby, extra_mkargs = [])
       objdir = product_build_dir crossruby
       executor.mkdir_p objdir
       do_extconf executor, crossruby
@@ -54,7 +54,8 @@ def build(executor, crossruby)
                       "-C",
                       "#{objdir}",
                       *make_args(crossruby),
-                      build_target
+                      build_target,
+                      *extra_mkargs
       # A ext can provide link args by link.filelist. It contains only built archive file by default.
       unless File.exist?(linklist(crossruby))
         executor.write(
@@ -187,7 +188,7 @@ def need_extinit_obj?
     def build_exts(executor)
       @user_exts.each do |prod|
         executor.begin_section prod.class, prod.name, "Building"
-        prod.build(executor, self)
+        prod.build(executor, self, [])
         executor.end_section prod.class, prod.name
       end
     end

lib/ruby_wasm/packager.rb

@@ -32,6 +32,8 @@ def package(executor, dest_dir, options)
 
     wasm_bytes = File.binread(File.join(fs.ruby_root, "bin", "ruby"))
 
+    ruby_core.build_gem_exts(executor, fs.bundle_dir)
+
     fs.package_gems
     fs.remove_non_runtime_files(executor)
     fs.remove_stdlib(executor) unless options[:stdlib]
@@ -44,7 +46,7 @@ def package(executor, dest_dir, options)
 
       wasm_bytes = wasi_vfs.pack(wasm_bytes)
     end
-    wasm_bytes = ruby_core.build_and_link_exts(executor, wasm_bytes)
+    wasm_bytes = ruby_core.link_gem_exts(executor, fs.bundle_dir, wasm_bytes)
 
     wasm_bytes = RubyWasmExt.preinitialize(wasm_bytes) if options[:optimize]
     wasm_bytes

lib/ruby_wasm/packager/core.rb

@@ -12,7 +12,7 @@ def build(executor, options)
 
   extend Forwardable
 
-  def_delegators :build_strategy, :cache_key, :artifact, :build_and_link_exts
+  def_delegators :build_strategy, :cache_key, :artifact, :build_gem_exts, :link_gem_exts
 
   private
 
@@ -37,7 +37,11 @@ def build(executor, options)
       raise NotImplementedError
     end
 
-    def build_and_link_exts(executor, module_bytes)
+    def build_gem_exts(executor, gem_home)
+      raise NotImplementedError
+    end
+
+    def link_gem_exts(executor, gem_home, module_bytes)
       raise NotImplementedError
     end
 
@@ -93,13 +97,17 @@ def build(executor, options)
       build.crossruby.artifact
     end
 
-    def build_and_link_exts(executor, module_bytes)
+    def build_gem_exts(executor, gem_home)
       build = derive_build
-      self.build_exts(executor, build)
-      self.link_exts(executor, build)
+      self._build_gem_exts(executor, build, gem_home)
     end
 
-    def link_exts(executor, build)
+    def link_gem_exts(executor, gem_home, module_bytes)
+      build = derive_build
+      self._link_gem_exts(executor, build, gem_home)
+    end
+
+    def _link_gem_exts(executor, build, gem_home)
       ruby_root = build.crossruby.dest_dir
 
       libraries = [File.join(ruby_root, "usr", "local", "bin", "ruby")]
@@ -121,7 +129,10 @@ def link_exts(executor, build)
       end
       wasi_adapter = RubyWasm::Packager::ComponentAdapter.wasi_snapshot_preview1("command")
       adapters = [wasi_adapter]
-      dl_openable_libs = Dir.glob(File.join(ruby_root, "usr", "local", "lib", "ruby", "**", "*.so"))
+      dl_openable_libs = []
+      dl_openable_libs << [File.join(ruby_root, "usr"), Dir.glob(File.join(ruby_root, "usr", "local", "lib", "ruby", "**", "*.so"))]
+      dl_openable_libs << [gem_home, Dir.glob(File.join(gem_home, "gems", "**", "*.so"))]
+
       linker = RubyWasmExt::ComponentLink.new
       linker.use_built_in_libdl(true)
       linker.stub_missing_functions(false)
@@ -135,12 +146,14 @@ def link_exts(executor, build)
         linker.library(lib_name, module_bytes, false)
       end
 
-      dl_openable_libs.each do |lib|
-        # DL openable lib_name should be a relative path from ruby_root
-        lib_name = "/" + Pathname.new(lib).relative_path_from(Pathname.new(ruby_root)).to_s
-        module_bytes = File.binread(lib)
-        RubyWasm.logger.info "Linking #{lib_name} (#{module_bytes.size} bytes)"
-        linker.library(lib_name, module_bytes, true)
+      dl_openable_libs.each do |root, libs|
+        libs.each do |lib|
+          # DL openable lib_name should be a relative path from ruby_root
+          lib_name = "/" + Pathname.new(lib).relative_path_from(Pathname.new(File.dirname(root))).to_s
+          module_bytes = File.binread(lib)
+          RubyWasm.logger.info "Linking #{lib_name} (#{module_bytes.size} bytes)"
+          linker.library(lib_name, module_bytes, true)
+        end
       end
 
       adapters.each do |adapter|
@@ -153,24 +166,30 @@ def link_exts(executor, build)
       return linker.encode()
     end
 
-    def build_exts(executor, build)
+    def _build_gem_exts(executor, build, gem_home)
       exts = specs_with_extensions.flat_map do |spec, exts|
         exts.map do |ext|
           ext_feature = File.dirname(ext) # e.g. "ext/cgi/escape"
           ext_srcdir = File.join(spec.full_gem_path, ext_feature)
           ext_relative_path = File.join(spec.full_name, ext_feature)
-          RubyWasm::CrossRubyExtProduct.new(
+          prod = RubyWasm::CrossRubyExtProduct.new(
             ext_srcdir,
             build.toolchain,
             features: @packager.features,
             ext_relative_path: ext_relative_path
           )
+          [prod, spec]
         end
       end
 
-      exts.each do |prod|
+      exts.each do |prod, spec|
+        libdir = File.join(gem_home, "gems", spec.full_name, spec.raw_require_paths.first)
+        extra_mkargs = [
+          "sitearchdir=#{libdir}",
+          "sitelibdir=#{libdir}",
+        ]
         executor.begin_section prod.class, prod.name, "Building"
-        prod.build(executor, build.crossruby)
+        prod.build(executor, build.crossruby, extra_mkargs)
         executor.end_section prod.class, prod.name
       end
     end
@@ -301,7 +320,11 @@ def derive_build
       build
     end
 
-    def build_and_link_exts(executor, module_bytes)
+    def build_gem_exts(executor, gem_home)
+      # No-op because we already built extensions as part of the Ruby build
+    end
+
+    def link_gem_exts(executor, gem_home, module_bytes)
       return module_bytes unless @packager.features.support_component_model?
 
       linker = RubyWasmExt::ComponentEncode.new

sig/ruby_wasm/build.rbs

@@ -168,7 +168,7 @@ module RubyWasm
     def feature_name: (CrossRubyProduct crossruby) -> String
 
     def make_args: (CrossRubyProduct crossruby) -> Array[String]
-    def build: (BuildExecutor executor, CrossRubyProduct crossruby) -> void
+    def build: (BuildExecutor executor, CrossRubyProduct crossruby, Array[String] extra_mkargs) -> void
     def do_extconf: (BuildExecutor executor, CrossRubyProduct crossruby) -> void
     def do_install_rb: (BuildExecutor executor, CrossRubyProduct crossruby) -> void
 

sig/ruby_wasm/packager.rbs

@@ -56,7 +56,8 @@ class RubyWasm::Packager
     @packager: RubyWasm::Packager
     def initialize: (RubyWasm::Packager) -> void
     def build: (RubyWasm::BuildExecutor, untyped options) -> String
-    def build_and_link_exts: (RubyWasm::BuildExecutor, bytes module_bytes) -> bytes
+    def build_gem_exts: (RubyWasm::BuildExecutor, string gem_home) -> void
+    def link_gem_exts: (RubyWasm::BuildExecutor, string gem_home, bytes module_bytes) -> bytes
 
     extend Forwardable
 
@@ -72,16 +73,17 @@ class RubyWasm::Packager
       def initialize: (RubyWasm::Packager) -> void
       def build: (RubyWasm::BuildExecutor, untyped options) -> String
       def specs_with_extensions: () -> Array[[untyped, Array[string]]]
-      def build_and_link_exts: (RubyWasm::BuildExecutor, bytes module_bytes) -> bytes
+      def build_gem_exts: (RubyWasm::BuildExecutor, string gem_home) -> void
+      def link_gem_exts: (RubyWasm::BuildExecutor, string gem_home, bytes module_bytes) -> bytes
     end
 
     class DynamicLinking < RubyWasm::Packager::Core::BuildStrategy
       @build: RubyWasm::Build
       def derive_build: () -> RubyWasm::Build
-      def build_exts: (RubyWasm::BuildExecutor, RubyWasm::Build) -> void
       def name: () -> string
 
-      private def link_exts: (RubyWasm::BuildExecutor, RubyWasm::Build) -> bytes
+      private def _build_gem_exts: (RubyWasm::BuildExecutor, RubyWasm::Build, string gem_home) -> void
+      private def _link_gem_exts: (RubyWasm::BuildExecutor, RubyWasm::Build, string gem_home) -> bytes
     end
 
     class StaticLinking < RubyWasm::Packager::Core::BuildStrategy