tebako 0.15.4 → 0.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31b6a9f91e71ad6fbb05ca788f1319523459f013f1ce7616907c307e8ca38487
-  data.tar.gz: 8e6fb6f06fe972e8edbf4a223d950416d06039f65959d98555380d2c885f25c8
+  metadata.gz: c715e1aa147daa49822f94e67fccd62fba55abebce35579a9b5aec3fc13dd400
+  data.tar.gz: b9d4d2d079162a8e557c88cd46ee827fd82b3b7cbca6ebd4adf0935b25a4c266
 SHA512:
-  metadata.gz: 8744d1496483fa738722259b28d41f4f20582ce15eb831a7ba1906b791693a279fbc1841f7e5c55cdc49ac10dfef2a23c23a954f36e3d5b891fcdfdfe9a06d21
-  data.tar.gz: 2df694097bbc081c36d680eff2c754ed61b71bc6f691d4fe7a9d8d7d02524946ac93beaebf5b828498c0291d3e51cd73f4b93b9555966a5401d03d3bf5f4dd2a
+  metadata.gz: abe104408b954c1da7cb133c9c55c5d3c9926bcf5e253e9b633d4a954cb333b78272a3128cb119554d27e3616f02ef48d1db80c51ae90710e520fca25c774234
+  data.tar.gz: fbae51e79b5525115f05f043c39d98d06a9e9b9ba4ccbd1a2ff2d31be0f035765b830e70cdce7b030c321b22eb853528297f90bed634a8927a929083614bddfb

data/lib/tebako/packager/pass1_patch.rb

@@ -265,7 +265,13 @@ module Tebako
           # ....................................................
           # Rename ruby's clock_gettime/clock_getres fallbacks before the
           # toolchain build (winpthreads static-inline collision)
-          "win32/win32.c" => WIN32_WIN32_C_CLOCK_PATCH
+          "win32/win32.c" => WIN32_WIN32_C_CLOCK_PATCH,
+          # ....................................................
+          # Group-wrap the static-ext ruby.exe link libraries
+          "common.mk" => COMMON_MK_STATIC_RUBY_LINK_PATCH,
+          # ....................................................
+          # Group-wrap the generated Makefile's PROGRAM link (msys)
+          "template/Makefile.in" => TEMPLATE_MAKEFILE_IN_STATIC_RUBY_LINK_PATCH
         }
       end
 

data/lib/tebako/packager/pass2msys_patch.rb

@@ -185,7 +185,13 @@ module Tebako
           "cygwin/GNUmakefile.in" => gnumakefile_in_patch_p2,
           "ruby.c" => RUBY_C_MSYS_PATCHES,
           "win32/file.c" => WIN32_FILE_C_MSYS_PATCHES,
-          "win32/win32.c" => WIN32_WIN32_C_MSYS_PATCHES
+          "win32/win32.c" => WIN32_WIN32_C_MSYS_PATCHES,
+          # Group-wrap the static-ext ruby.exe link libraries for the final
+          # build (same common.mk STATIC_RUBY rule as the toolchain build)
+          "common.mk" => COMMON_MK_STATIC_RUBY_LINK_PATCH,
+          # ....................................................
+          # Group-wrap the generated Makefile's PROGRAM link (msys)
+          "template/Makefile.in" => TEMPLATE_MAKEFILE_IN_STATIC_RUBY_LINK_PATCH
         }
       end
     end

data/lib/tebako/packager/patch.rb

@@ -44,6 +44,32 @@ module Tebako
       # End of tebako patch
     SUBST
 
+    # The static-ext ruby.exe link (common.mk STATIC_RUBY rule, identical in
+    # ruby 3.1-4.0) puts the vcpkg static OpenSSL ahead of the Windows system
+    # libs it references (Cert* from crypt32, WspiapiGet* from ws2_32); GNU
+    # ld's single pass then leaves them unresolved (tebako#345). Group-wrap
+    # the libs so resolution is order-insensitive. Shared across Pass1
+    # (toolchain build) and Pass2 (final build, re-patched from pristine).
+    COMMON_MK_STATIC_RUBY_LINK_PATCH = {
+      "$(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@" =>
+        "$(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) -Wl,--start-group $(MAINLIBS) $(EXTLIBS) $(LIBS) " \
+        "-Wl,--end-group $(OUTFLAG)$@ # tebako patched"
+    }.freeze
+
+    # The PROGRAM link in template/Makefile.in (the generated Makefile --
+    # the one the exts.mk submake actually links ruby.exe with) has the same
+    # static-lib ordering problem on msys. Ruby 3.3+ links
+    # MAINLIBS+EXTLIBS; 3.1/3.2 link MAINLIBS+LIBS+EXTLIBS -- wrap both
+    # shapes (only one matches per version, the other is a harmless no-op).
+    TEMPLATE_MAKEFILE_IN_STATIC_RUBY_LINK_PATCH = {
+      "$(LIBRUBYARG) $(MAINLIBS) $(EXTLIBS) $(OUTFLAG)$@" =>
+        "$(LIBRUBYARG) -Wl,--start-group $(MAINLIBS) $(EXTLIBS) -Wl,--end-group $(OUTFLAG)$@ " \
+        "# tebako patched",
+      "$(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@" =>
+        "$(LIBRUBYARG) -Wl,--start-group $(MAINLIBS) $(LIBS) $(EXTLIBS) -Wl,--end-group " \
+        "$(OUTFLAG)$@ # tebako patched"
+    }.freeze
+
     # Ruby patching definitions (common base)
     class Patch
       def patch_map

data/lib/tebako/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.15.4"
+  VERSION = "0.15.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.6
 platform: ruby
 authors:
 - Ribose Inc.