Merge pull request #315 from ruby/katei/update-openssl

Update OpenSSL to 3.2.0

Author: kateinoigakukun

lib/ruby_wasm/build.rb

@@ -59,10 +59,16 @@ def system(*args, chdir: nil, env: nil)
               [out, err, wait_thr.value]
             end
           begin
-            if env
-              Open3.popen3(env, *args, **kwargs, &block)
-            else
-              Open3.popen3(*args, **kwargs, &block)
+            stdout, stderr, status =
+              if env
+                Open3.popen3(env, *args, **kwargs, &block)
+              else
+                Open3.popen3(*args, **kwargs, &block)
+              end
+            unless status.success?
+              $stderr.puts stdout
+              $stderr.puts stderr
+              raise "Command failed with status (#{status.exitstatus}): #{args.join(" ")}"
             end
           ensure
             printer.done

lib/ruby_wasm/build/product/openssl.rb

@@ -5,7 +5,7 @@ module RubyWasm
   class OpenSSLProduct < AutoconfProduct
     attr_reader :target
 
-    OPENSSL_VERSION = "3.0.5"
+    OPENSSL_VERSION = "3.2.0"
 
     def initialize(build_dir, target, toolchain)
       @build_dir = build_dir
@@ -41,21 +41,23 @@ def configure_args
         -no-sock
         -no-dgram
         --libdir=lib
-        -DNO_SYSLOG
         -Wl,--allow-undefined
       ]
       if @target == "wasm32-unknown-wasi"
         args.concat %w[
                       -D_WASI_EMULATED_SIGNAL
                       -D_WASI_EMULATED_PROCESS_CLOCKS
                       -D_WASI_EMULATED_MMAN
+                      -D_WASI_EMULATED_GETPID
+                      -DNO_CHMOD
+                      -DHAVE_FORK=0
                     ]
       end
       args + tools_args
     end
 
     def build(executor)
-      return if Dir.exist?(install_root)
+      return if File.exist?(File.join(install_root, "lib", "libssl.a"))
 
       executor.mkdir_p File.dirname(product_build_dir)
       executor.rm_rf product_build_dir
@@ -79,7 +81,7 @@ def build(executor)
       # OpenSSL build system doesn't have well support for parallel build, so force -j1.
       executor.system "make",
                       "-j1",
-                      "install_sw",
+                      "install_dev",
                       "DESTDIR=#{destdir}",
                       chdir: product_build_dir
     end

lib/ruby_wasm/rake_task.rb

@@ -103,6 +103,7 @@ def hexdigest
     digest << @toolchain.name
     digest << @libyaml.name
     digest << @zlib.name
+    digest << @openssl.name
     digest << @wasi_vfs.name
     digest.hexdigest
   end