ruby_wasm 2.5.0.pre.1 → 2.5.1

data/lib/ruby_wasm/build/product/crossruby.rb

@@ -37,7 +37,6 @@ module RubyWasm
       make_args << "AR=#{@toolchain.ar}"
       make_args << "RANLIB=#{@toolchain.ranlib}"
 
-      make_args << "DESTDIR=#{crossruby.dest_dir}"
       make_args
     end
 
@@ -45,12 +44,15 @@ module RubyWasm
       objdir = product_build_dir crossruby
       executor.mkdir_p objdir
       do_extconf executor, crossruby
+
+      executor.system "make", "-C", objdir, *make_args(crossruby), "clean"
+      build_target = crossruby.target.pic? ? "install-so" : "static"
       executor.system "make",
                       "-j#{executor.process_count}",
                       "-C",
                       "#{objdir}",
                       *make_args(crossruby),
-                      "static"
+                      build_target
       # A ext can provide link args by link.filelist. It contains only built archive file by default.
       unless File.exist?(linklist(crossruby))
         executor.write(
@@ -61,9 +63,27 @@ module RubyWasm
     end
 
     def do_extconf(executor, crossruby)
+      unless crossruby.target.pic?
+        self.do_legacy_extconf(executor, crossruby)
+        return
+      end
+      objdir = product_build_dir crossruby
+      source = crossruby.source
+      rbconfig_rb = Dir.glob(File.join(crossruby.dest_dir, "usr/local/lib/ruby/*/wasm32-wasi/rbconfig.rb")).first
+      raise "rbconfig.rb not found" unless rbconfig_rb
+      extconf_args = [
+        "-C", objdir,
+        "#{@srcdir}/extconf.rb",
+        "--target-rbconfig=#{rbconfig_rb}",
+      ]
+      executor.system Gem.ruby, *extconf_args
+    end
+
+    def do_legacy_extconf(executor, crossruby)
       objdir = product_build_dir crossruby
       source = crossruby.source
       extconf_args = [
+        "-C", objdir,
         "--disable=gems",
         # HACK: top_srcdir is required to find ruby headers
         "-e",
@@ -71,9 +91,6 @@ module RubyWasm
         # HACK: extout is required to find config.h
         "-e",
         %Q($extout="#{crossruby.build_dir}/.ext"),
-        # HACK: skip have_devel check since ruby is not installed yet
-        "-e",
-        "$have_devel = true",
         # HACK: force static ext build by imitating extmk
         "-e",
         "$static = true; trace_var(:$static) {|v| $static = true }",
@@ -93,7 +110,6 @@ module RubyWasm
       # Clear RUBYOPT to avoid loading unrelated bundle setup
       executor.system crossruby.baseruby_path,
                       *extconf_args,
-                      chdir: objdir,
                       env: {
                         "RUBYOPT" => ""
                       }
@@ -118,7 +134,7 @@ module RubyWasm
   end
 
   class CrossRubyProduct < AutoconfProduct
-    attr_reader :source, :toolchain
+    attr_reader :target, :source, :toolchain
     attr_accessor :user_exts,
                   :wasmoptflags,
                   :cppflags,
@@ -155,6 +171,14 @@ module RubyWasm
       executor.system "make", "rbconfig.rb", chdir: build_dir
     end
 
+    def need_exts_build?
+      @user_exts.any?
+    end
+
+    def need_extinit_obj?
+      need_exts_build? && !@target.pic?
+    end
+
     def build_exts(executor)
       @user_exts.each do |prod|
         executor.begin_section prod.class, prod.name, "Building"
@@ -168,6 +192,7 @@ module RubyWasm
       executor.mkdir_p build_dir
       @toolchain.install
       [@source, @baseruby, @libyaml, @zlib, @openssl, @wasi_vfs].each do |prod|
+        next unless prod
         executor.begin_section prod.class, prod.name, "Building"
         prod.build(executor)
         executor.end_section prod.class, prod.name
@@ -176,17 +201,20 @@ module RubyWasm
       configure(executor, reconfigure: reconfigure)
       executor.end_section self.class, name
 
-      build_exts(executor)
+      build_exts(executor) if need_exts_build?
 
       executor.begin_section self.class, name, "Building"
-      executor.mkdir_p File.dirname(extinit_obj)
-      executor.system "ruby",
-                      extinit_c_erb,
-                      *@user_exts.map { |ext| ext.feature_name(self) },
-                      "--cc",
-                      toolchain.cc,
-                      "--output",
-                      extinit_obj
+
+      if need_extinit_obj?
+        executor.mkdir_p File.dirname(extinit_obj)
+        executor.system "ruby",
+                        extinit_c_erb,
+                        *@user_exts.map { |ext| ext.feature_name(self) },
+                        "--cc",
+                        toolchain.cc,
+                        "--output",
+                        extinit_obj
+      end
       install_dir = File.join(build_dir, "install")
       if !File.exist?(install_dir) || remake || reconfigure
         executor.system "make",
@@ -216,7 +244,7 @@ module RubyWasm
     end
 
     def cache_key(digest)
-      digest << @params.target
+      @params.target.cache_key(digest)
       digest << @params.default_exts
       @wasmoptflags.each { |f| digest << f }
       @cppflags.each { |f| digest << f }
@@ -229,11 +257,11 @@ module RubyWasm
     end
 
     def build_dir
-      File.join(@build_dir, @params.target, name)
+      File.join(@build_dir, @params.target.to_s, name)
     end
 
     def ext_build_dir
-      File.join(@build_dir, @params.target, name + "-ext")
+      File.join(@build_dir, @params.target.to_s, name + "-ext")
     end
 
     def with_libyaml(libyaml)
@@ -274,14 +302,14 @@ module RubyWasm
     end
 
     def configure_args(build_triple, toolchain)
-      target = @params.target
+      target = @params.target.triple
       default_exts = @params.default_exts
 
       ldflags = @ldflags.dup
       xldflags = @xldflags.dup
 
       args = self.system_triplet_args + ["--build", build_triple]
-      args << "--with-static-linked-ext"
+      args << "--with-static-linked-ext" unless @params.target.pic?
       args << %Q(--with-ext=#{default_exts})
       args << %Q(--with-libyaml-dir=#{@libyaml.install_root})
       args << %Q(--with-zlib-dir=#{@zlib.install_root})
@@ -289,7 +317,7 @@ module RubyWasm
       args << %Q(--with-baseruby=#{baseruby_path})
 
       case target
-      when "wasm32-unknown-wasi"
+      when /^wasm32-unknown-wasi/
         xldflags << @wasi_vfs.lib_wasi_vfs_a if @wasi_vfs
         # TODO: Find a way to force cast or update API
         # @type var wasi_sdk_path: untyped
@@ -298,14 +326,19 @@ module RubyWasm
         args << %Q(WASI_SDK_PATH=#{wasi_sdk_path.wasi_sdk_path})
       when "wasm32-unknown-emscripten"
         ldflags.concat(%w[-s MODULARIZE=1])
+        env_emcc_ldflags = ENV["RUBY_WASM_EMCC_LDFLAGS"] || ""
+        unless env_emcc_ldflags.empty?
+          ldflags << env_emcc_ldflags
+        end
       else
         raise "unknown target: #{target}"
       end
 
       args.concat(self.tools_args)
       (@user_exts || []).each { |lib| xldflags << "@#{lib.linklist(self)}" }
-      xldflags << extinit_obj
+      xldflags << extinit_obj if need_extinit_obj?
 
+      cflags = @cflags.dup
       xcflags = @xcflags.dup
       xcflags << "-DWASM_SETJMP_STACK_BUFFER_SIZE=24576"
       xcflags << "-DWASM_FIBER_STACK_BUFFER_SIZE=24576"
@@ -313,6 +346,7 @@ module RubyWasm
 
       args << %Q(LDFLAGS=#{ldflags.join(" ")})
       args << %Q(XLDFLAGS=#{xldflags.join(" ")})
+      args << %Q(CFLAGS=#{cflags.join(" ")})
       args << %Q(XCFLAGS=#{xcflags.join(" ")})
       args << %Q(debugflags=#{@debugflags.join(" ")})
       args << %Q(cppflags=#{@cppflags.join(" ")})

data/lib/ruby_wasm/build/product/libyaml.rb

@@ -13,7 +13,7 @@ module RubyWasm
     end
 
     def product_build_dir
-      File.join(@build_dir, target, "yaml-#{LIBYAML_VERSION}")
+      File.join(@build_dir, target.to_s, "yaml-#{LIBYAML_VERSION}")
     end
 
     def destdir
@@ -52,12 +52,14 @@ module RubyWasm
       executor.system "curl",
                       "-o",
                       "#{product_build_dir}/config/config.guess",
-                      "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD"
+                      "https://cdn.jsdelivr.net/gh/gcc-mirror/gcc@master/config.guess"
       executor.system "curl",
                       "-o",
                       "#{product_build_dir}/config/config.sub",
-                      "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
+                      "https://cdn.jsdelivr.net/gh/gcc-mirror/gcc@master/config.sub"
 
+      configure_args = self.configure_args.dup
+      configure_args << "CFLAGS=-fPIC" if target.pic?
       executor.system "./configure", *configure_args, chdir: product_build_dir
       executor.system "make",
                       "install",

data/lib/ruby_wasm/build/product/openssl.rb

@@ -13,7 +13,7 @@ module RubyWasm
     end
 
     def product_build_dir
-      File.join(@build_dir, target, "openssl-#{OPENSSL_VERSION}")
+      File.join(@build_dir, target.to_s, "openssl-#{OPENSSL_VERSION}")
     end
 
     def destdir
@@ -42,7 +42,7 @@ module RubyWasm
         --libdir=lib
         -Wl,--allow-undefined
       ]
-      if @target == "wasm32-unknown-wasi"
+      if @target.triple.start_with?("wasm32-unknown-wasi")
         args.concat %w[
                       -D_WASI_EMULATED_SIGNAL
                       -D_WASI_EMULATED_PROCESS_CLOCKS
@@ -52,6 +52,11 @@ module RubyWasm
                       -DHAVE_FORK=0
                     ]
       end
+
+      if @target.pic?
+        args << "-fPIC"
+      end
+
       args + tools_args
     end
 

data/lib/ruby_wasm/build/product/product.rb

@@ -12,13 +12,13 @@ module RubyWasm
     end
     def system_triplet_args
       args = []
-      case @target
-      when "wasm32-unknown-wasi"
+      case @target.triple
+      when /^wasm32-unknown-wasi/
         args.concat(%W[--host wasm32-wasi])
       when "wasm32-unknown-emscripten"
         args.concat(%W[--host wasm32-emscripten])
       else
-        raise "unknown target: #{@target}"
+        raise "unknown target: #{@target.triple}"
       end
       args
     end

data/lib/ruby_wasm/build/product/ruby_source.rb

@@ -19,7 +19,7 @@ module RubyWasm
       when "tarball"
         digest << @params[:url]
       when "local"
-        digest << File.mtime(@params[:src]).to_i.to_s
+        digest << File.mtime(@params[:path]).to_i.to_s
       else
         raise "unknown source type: #{@params[:type]}"
       end
@@ -75,12 +75,12 @@ module RubyWasm
         )
       when "local"
         executor.mkdir_p File.dirname(src_dir)
-        executor.cp_r @params[:src], src_dir
+        executor.ln_s File.expand_path(@params[:path]), src_dir
       else
         raise "unknown source type: #{@params[:type]}"
       end
       (@params[:patches] || []).each do |patch_path|
-        executor.system "patch", "-p1", patch_path, chdir: src_dir
+        executor.system "patch", "-p1", "-i", patch_path, chdir: src_dir
       end
     end
 

data/lib/ruby_wasm/build/product/wasi_vfs.rb

@@ -7,17 +7,12 @@ module RubyWasm
     def initialize(build_dir)
       @build_dir = build_dir
       @need_fetch_lib = ENV["LIB_WASI_VFS_A"].nil?
-      installed_cli_path =
-        ENV["WASI_VFS_CLI"] || Toolchain.find_path("wasi-vfs")
-      @need_fetch_cli = installed_cli_path.nil?
-      @cli_path =
-        installed_cli_path || File.join(cli_product_build_dir, "wasi-vfs")
     end
 
     def lib_product_build_dir
       File.join(
         @build_dir,
-        "wasm32-unknown-wasi",
+        "wasm32-unknown-wasip1",
         "wasi-vfs-#{WASI_VFS_VERSION}"
       )
     end
@@ -26,18 +21,6 @@ module RubyWasm
       ENV["LIB_WASI_VFS_A"] || File.join(lib_product_build_dir, "libwasi_vfs.a")
     end
 
-    def cli_product_build_dir
-      File.join(
-        @build_dir,
-        RbConfig::CONFIG["host"],
-        "wasi-vfs-#{WASI_VFS_VERSION}"
-      )
-    end
-
-    def cli_bin_path
-      @cli_path
-    end
-
     def name
       "wasi-vfs-#{WASI_VFS_VERSION}-#{RbConfig::CONFIG["host"]}"
     end
@@ -58,26 +41,5 @@ module RubyWasm
         executor.mv File.join(tmpdir, "libwasi_vfs.a"), lib_wasi_vfs_a
       end
     end
-
-    def install_cli
-      return if !@need_fetch_cli || File.exist?(cli_bin_path)
-      FileUtils.mkdir_p cli_product_build_dir
-      zipfile = File.join(cli_product_build_dir, "wasi-vfs-cli.zip")
-      system "curl", "-L", "-o", zipfile, self.cli_download_url
-      system "unzip", zipfile, "-d", cli_product_build_dir
-    end
-
-    def cli_download_url
-      assets = [
-        [/x86_64-linux/, "wasi-vfs-cli-x86_64-unknown-linux-gnu.zip"],
-        [/x86_64-darwin/, "wasi-vfs-cli-x86_64-apple-darwin.zip"],
-        [/arm64e?-darwin/, "wasi-vfs-cli-aarch64-apple-darwin.zip"]
-      ]
-      asset = assets.find { |os, _| os =~ RUBY_PLATFORM }&.at(1)
-      if asset.nil?
-        raise "unsupported platform for fetching wasi-vfs CLI: #{RUBY_PLATFORM}"
-      end
-      "https://github.com/kateinoigakukun/wasi-vfs/releases/download/v#{WASI_VFS_VERSION}/#{asset}"
-    end
   end
 end

data/lib/ruby_wasm/build/product/zlib.rb

@@ -4,7 +4,7 @@ module RubyWasm
   class ZlibProduct < AutoconfProduct
     attr_reader :target
 
-    ZLIB_VERSION = "1.3"
+    ZLIB_VERSION = "1.3.1"
 
     def initialize(build_dir, target, toolchain)
       @build_dir = build_dir
@@ -13,7 +13,7 @@ module RubyWasm
     end
 
     def product_build_dir
-      File.join(@build_dir, target, "zlib-#{ZLIB_VERSION}")
+      File.join(@build_dir, target.to_s, "zlib-#{ZLIB_VERSION}")
     end
 
     def destdir
@@ -46,7 +46,7 @@ module RubyWasm
                       "-o",
                       tarball_path,
                       "-L",
-                      "https://zlib.net/zlib-#{ZLIB_VERSION}.tar.gz"
+                      "https://github.com/madler/zlib/releases/download/v#{ZLIB_VERSION}/zlib-#{ZLIB_VERSION}.tar.gz"
       executor.system "tar",
                       "xzf",
                       tarball_path,
@@ -54,6 +54,8 @@ module RubyWasm
                       product_build_dir,
                       "--strip-components=1"
 
+      configure_args = self.configure_args.dup
+      configure_args << "CFLAGS=-fPIC" if target.pic?
       executor.system "env",
                       *configure_args,
                       "./configure",

data/lib/ruby_wasm/build/target.rb

@@ -0,0 +1,24 @@
+module RubyWasm
+  # A build target representation
+  class Target
+    attr_reader :triple
+
+    def initialize(triple, pic: false)
+      @triple = triple
+      @pic = pic
+    end
+
+    def pic?
+      @pic
+    end
+
+    def to_s
+      "#{@triple}#{@pic ? "-pic" : ""}"
+    end
+
+    def cache_key(digest)
+      digest << @triple
+      digest << "pic" if @pic
+    end
+  end
+end

data/lib/ruby_wasm/build/toolchain.rb

@@ -18,7 +18,7 @@ module RubyWasm
 
     def self.get(target, build_dir = nil)
       case target
-      when "wasm32-unknown-wasi"
+      when /^wasm32-unknown-wasi/
         return RubyWasm::WASISDK.new(build_dir: build_dir)
       when "wasm32-unknown-emscripten"
         return RubyWasm::Emscripten.new

data/lib/ruby_wasm/build.rb

@@ -2,6 +2,7 @@ require_relative "build/build_params"
 require_relative "build/product"
 require_relative "build/toolchain"
 require_relative "build/executor"
+require_relative "build/target"
 
 class RubyWasm::Build
   # Source to build from.
@@ -36,6 +37,7 @@ class RubyWasm::Build
     toolchain:,
     build_dir:,
     rubies_dir:,
+    wasi_vfs: :default,
     **options
   )
     @target = target
@@ -45,7 +47,7 @@ class RubyWasm::Build
 
     @libyaml = RubyWasm::LibYAMLProduct.new(@build_dir, @target, @toolchain)
     @zlib = RubyWasm::ZlibProduct.new(@build_dir, @target, @toolchain)
-    @wasi_vfs = RubyWasm::WasiVfsProduct.new(@build_dir)
+    @wasi_vfs = wasi_vfs == :default ? RubyWasm::WasiVfsProduct.new(@build_dir) : wasi_vfs
     @source = RubyWasm::BuildSource.new(src, @build_dir)
     @baseruby = RubyWasm::BaseRubyProduct.new(@build_dir, @source)
     @openssl = RubyWasm::OpenSSLProduct.new(@build_dir, @target, @toolchain)
@@ -78,11 +80,13 @@ class RubyWasm::Build
     @crossruby.cache_key(digest)
     digest << @build_dir
     digest << @rubies_dir
-    digest << @target
+    @target.cache_key(digest)
     digest << @toolchain.name
     digest << @libyaml.name
     digest << @zlib.name
     digest << @openssl.name
-    digest << @wasi_vfs.name
+    if wasi_vfs = @wasi_vfs
+      digest << wasi_vfs.name
+    end
   end
 end