tebako 0.7.4 → 0.8.1

data/common.env

@@ -1,5 +1,5 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.5.4
+DWARFS_WR_TAG=v0.5.7
 RUBY_VER=3.1.6

data/lib/tebako/cli_rubies.rb

@@ -40,12 +40,10 @@ module Tebako
     RUBY_VERSIONS = {
       "2.7.8" => "c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0",
       "3.0.7" => "2a3411977f2850431136b0fab8ad53af09fb74df2ee2f4fb7f11b378fe034388",
-      "3.1.4" => "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6",
-      "3.1.5" => "3685c51eeee1352c31ea039706d71976f53d00ab6d77312de6aa1abaf5cda2c5",
       "3.1.6" => "0d0dafb859e76763432571a3109d1537d976266be3083445651dc68deed25c22",
-      "3.2.3" => "af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba",
-      "3.2.4" => "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692"
-      # "3.3.3" => "83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2"
+      "3.2.4" => "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692",
+      "3.3.3" => "83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2",
+      "3.3.4" => "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34"
     }.freeze
 
     DEFAULT_RUBY_VERSION = "3.1.6"

data/lib/tebako/packager/pass1.rb

@@ -88,9 +88,23 @@ module Tebako
         SUBST
       }.freeze
 
-      # DARWIN_CONFIGURE_PATCH = {
-      #  "EXTDLDFLAGS=\"-bundle_loader '\\$(BUILTRUBY)'\"" => ""
-      # }.freeze
+      # The logic for statically linked extensions is broken entirely in the latest Ruby versions.
+      # The code below looks reasonble - we do not set -bundle_loader when building with -with-static-ext option
+      # However Gems bundled with Ruby just ignore with-static-ext option and build extensions as shared libraries
+      # So  the -bundler_loader option is required for them to link.
+      # It is strange that it is disabled in any case because this option does not create any issues for static
+      # libraries.
+      # ---------------------------------------------------
+      # elif test "x$EXTSTATIC" = x
+      # then :
+      #
+      #                            # When building exts as bundles, a mach-o bundle needs to know its loader
+      #                            # program to bind symbols from the ruby executable
+      #                            EXTDLDFLAGS="-bundle_loader '\$(BUILTRUBY)'"
+
+      DARWIN_CONFIGURE_PATCH = {
+        "elif test \"x$EXTSTATIC\" = x" => "elif true"
+      }.freeze
 
       OPENSSL_EXTCONF_RB_SUBST = <<~SUBST
         # Start of tebako patch
@@ -137,11 +151,7 @@ module Tebako
           patch_map = get_base_patch_map(mount_point)
 
           # ....................................................
-          # Fixing (bypassing) configure script bug where a variable is used before initialization
-          # On MacOS it generates bod EXTDLDFLAGS WITH -bundle_loader <missing parameter>
-          # However, it loooks likes EXTDLDFLAGS are just redundant for final Ruby linkage, so we are
-          # just removing it on pass 2 (at least for now)
-          # patch_map.store("configure", DARWIN_CONFIGURE_PATCH) if ostype =~ /darwin/
+          patch_map.store("configure", DARWIN_CONFIGURE_PATCH) if ostype =~ /darwin/
 
           # ....................................................
           # autoload :OpenSSL, "openssl"
@@ -178,13 +188,16 @@ module Tebako
               "$(WINMAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@  # tebako patched",
 
             "--output-exp=$(RUBY_EXP) \\" =>
-              "--output-exp=$(RUBY_EXP) --output-lib=$(LIBRUBY) --output-def=tebako.def \\",
+             "--output-exp=$(RUBY_EXP) --output-lib=$(LIBRUBY) --output-def=tebako.def \\",
+
+            "--export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)" =>
+              "--export-all $(LIBRUBY_A) $(LIBS) -o program-stub.exe   # tebako patched",
 
-            "	@rm -f $(PROGRAM)" =>
-              "# tebako patched  @rm -f $(PROGRAM)",
+            "@rm -f $(PROGRAM)" =>
+              "@rm -f program-stub.exe   # tebako patched",
 
             "	$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)" =>
-              "# tebako patched  $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)",
+             "# tebako patched  $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)",
 
             "RUBYDEF = $(DLL_BASE_NAME).def" => GNUMAKEFILE_IN_WINMAIN_SUBST
           }

data/lib/tebako/packager/pass2.rb

@@ -38,23 +38,26 @@ module Tebako
       class << self
         def get_patch_map(ostype, deps_lib_dir, ruby_ver)
           patch_map = get_patch_map_base(ostype, deps_lib_dir, ruby_ver)
-
           patch_map.store("thread_pthread.c", LINUX_MUSL_THREAD_PTHREAD_PATCH) if ostype =~ /linux-musl/
-
           if PatchHelpers.msys?(ostype)
             patch_map.merge!(get_msys_patches(ruby_ver))
           elsif PatchHelpers.ruby3x?(ruby_ver)
-            # [TODO] Do we really need it for platforms other then Windows ??
             patch_map.store("common.mk", COMMON_MK_PATCH)
           end
-
-          patch_map
+          extend_patch_map_r33(patch_map, ostype, deps_lib_dir, ruby_ver)
         end
 
         private
 
         include Tebako::Packager::PatchBuildsystem
         include Tebako::Packager::PatchLiterals
+        def extend_patch_map_r33(patch_map, ostype, deps_lib_dir, ruby_ver)
+          if PatchHelpers.ruby33?(ruby_ver) || PatchHelpers.msys?(ostype)
+            patch_map.store("config.status",
+                            get_config_status_patch(ostype, deps_lib_dir, ruby_ver))
+          end
+          patch_map
+        end
 
         def get_dir_c_patch(ostype)
           pattern = PatchHelpers.msys?(ostype) ? "/* define system APIs */" : "#ifdef HAVE_GETATTRLIST"
@@ -91,21 +94,17 @@ module Tebako
         end
 
         def get_util_c_patch(ruby_ver)
-          if PatchHelpers.ruby316?(ruby_ver)
+          if PatchHelpers.ruby31?(ruby_ver)
             PatchHelpers.patch_c_file_post("#endif /* !HAVE_GNU_QSORT_R */")
           else
             PatchHelpers.patch_c_file_pre("#ifndef S_ISDIR")
           end
         end
 
-        def get_msys_mkconfig_rb_patches(ruby_ver)
+        def get_tool_mkconfig_rb_patch(ostype)
+          subst = PatchHelpers.msys?(ostype) ? TOOL_MKCONFIG_RB_SUBST_MSYS : TOOL_MKCONFIG_RB_SUBST
           {
-            "    if fast[name]" => TOOLS_MKCONFIG_RB_SUBST,
-            "when /RUBYGEMS/; next" =>
-              "when /RUBYGEMS/; next\n\n" \
-              "# Start of tebako patch\n" \
-              "when /MAINLIBS/; val = #{PatchLibraries.msys_base_libs(ruby_ver)}\n" \
-              "# End of tebako patch"
+            "    if fast[name]" => subst
           }
         end
 
@@ -119,10 +118,9 @@ module Tebako
         end
 
         def get_patch_map_base(ostype, deps_lib_dir, ruby_ver)
-          mcrb_subst = PatchHelpers.msys?(ostype) ? get_msys_mkconfig_rb_patches(ruby_ver) : TOOL_MKCONFIG_RB_PATCH
           {
             "template/Makefile.in" => template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver),
-            "tool/mkconfig.rb" => mcrb_subst,
+            "tool/mkconfig.rb" => get_tool_mkconfig_rb_patch(ostype),
             "dir.c" => get_dir_c_patch(ostype),            "dln.c" => get_dln_c_patch(ostype, ruby_ver),
             "io.c" => get_io_c_patch(ostype, ruby_ver),    "main.c" => MAIN_C_PATCH,
             "file.c" => PatchHelpers.patch_c_file_pre("/* define system APIs */"),
@@ -135,7 +133,7 @@ module Tebako
           {
             "MAINLIBS = #{yjit_libs}@MAINLIBS@" =>
               "# -- Start of tebako patch -- \n" \
-              "MAINLIBS = #{yjit_libs}#{PatchLibraries.mlibs(ostype, deps_lib_dir, ruby_ver)}" \
+              "MAINLIBS = #{yjit_libs}#{PatchLibraries.mlibs(ostype, deps_lib_dir, ruby_ver, true)}\n" \
               "# -- End of tebako patch -- \n"
           }
         end

data/lib/tebako/packager/patch_buildsystem.rb

@@ -57,10 +57,14 @@ module Tebako
         "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
         "# -- End of tebako patch --"
 
-      TEMPLATE_MAKEFILE_IN_BASE_PATTERN =
+      TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_3 =
         "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) " \
         "$(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
 
+      TEMPLATE_MAKEFILE_IN_BASE_PATTERN =
+        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) " \
+        "$(LIBRUBYARG) $(MAINLIBS) $(EXTLIBS) $(OUTFLAG)$@"
+
       TEMPLATE_MAKEFILE_IN_BASE_PATCH =
         "# -- Start of tebako patch --\n" \
         "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(MAINOBJ) " \
@@ -73,13 +77,23 @@ module Tebako
         "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
         "# -- End of tebako patch --"
 
-      def template_makefile_in_patch_two(ostype, ruby_ver)
+      def template_makefile_in_subst(ostype, ruby_ver)
         if PatchHelpers.msys?(ostype)
-          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => TEMPLATE_MAKEFILE_IN_BASE_PATCH_MSYS }
-        elsif PatchHelpers.ruby31?(ruby_ver)
-          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => TEMPLATE_MAKEFILE_IN_BASE_PATCH }
+          TEMPLATE_MAKEFILE_IN_BASE_PATCH_MSYS
+        elsif !PatchHelpers.ruby31?(ruby_ver)
+          TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1
+        else
+          TEMPLATE_MAKEFILE_IN_BASE_PATCH
+        end
+      end
+
+      def template_makefile_in_patch_two(ostype, ruby_ver)
+        if !PatchHelpers.ruby31?(ruby_ver)
+          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 => template_makefile_in_subst(ostype, ruby_ver) }
+        elsif !PatchHelpers.ruby33?(ruby_ver)
+          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_3 => template_makefile_in_subst(ostype, ruby_ver) }
         else
-          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 => TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1 }
+          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => template_makefile_in_subst(ostype, ruby_ver) }
         end
       end
 
@@ -94,10 +108,30 @@ module Tebako
         # End of tebako patch
       SUBST
 
+      def get_config_status_pattern(ostype)
+        case ostype
+        when /linux-/
+          "S[\"MAINLIBS\"]=\"-lz -lrt -lrt -ldl -lcrypt -lm -lpthread \""
+        when /darwin/
+          "S[\"MAINLIBS\"]=\"-ldl -lobjc -lpthread \""
+        when /msys/
+          "S[\"MAINLIBS\"]=\"-lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi -lbcrypt \""
+        else
+          raise Tebako::Error, "Unknown ostype #{ostype}"
+        end
+      end
+
+      def get_config_status_patch(ostype, deps_lib_dir, ruby_ver)
+        {
+          get_config_status_pattern(ostype) =>
+            "S[\"MAINLIBS\"]=\"#{PatchLibraries.mlibs(ostype, deps_lib_dir, ruby_ver, false)}\""
+        }
+      end
+
       # Other MSYS (GNUMakefile) specific patches
       #  - The same issue with libraries as for Makefile above
       #  - 'Kill' ruby.exp regeneration on pass2
-      #     since we want to use outpu from pass1 for implib generation
+      #     since we want to use output from pass1 for implib generation
       #     [VERY UGLY HACK]
       #  - Introduce LIBRUBY dependency on static extensions
       #    This is an addition to COMMON_MK_PATCH specified above

data/lib/tebako/packager/patch_helpers.rb

@@ -116,10 +116,6 @@ module Tebako
           ruby3x?(ruby_ver) && ruby_ver[2].to_i >= 1
         end
 
-        def ruby316?(ruby_ver)
-          ruby3x?(ruby_ver) && ruby_ver[2] == "1" && ruby_ver[4].to_i >= 6
-        end
-
         def ruby32?(ruby_ver)
           ruby3x?(ruby_ver) && ruby_ver[2].to_i >= 2
         end

data/lib/tebako/packager/patch_libraries.rb

@@ -34,37 +34,104 @@ module Tebako
     module PatchLibraries
       class << self
         # rubocop:disable Style/WordArray
-
-        # NOTE: folly provides build-in implementation of jemalloc
-
         DARWIN_BREW_LIBS = [
-          ["zlib", "z"],            ["gdbm", "gdbm"],           ["readline", "readline"], ["libffi", "ffi"],
-          ["ncurses", "ncurses"],   ["fmt", "fmt"],             ["lz4", "lz4"],           ["xz", "lzma"],
-          ["libyaml", "yaml"],      ["boost", "boost_chrono"],  ["double-conversion", "double-conversion"]
+          ["zlib", "z"],              ["gdbm", "gdbm"],           ["readline", "readline"], ["libffi", "ffi"],
+          ["ncurses", "ncurses"],     ["fmt", "fmt"],             ["lz4", "lz4"],           ["xz", "lzma"],
+          ["libyaml", "yaml"],        ["boost", "boost_chrono"],  ["double-conversion", "double-conversion"]
         ].freeze
 
         DARWIN_BREW_LIBS_PRE_31 = [["openssl@1.1", "ssl"], ["openssl@1.1", "crypto"]].freeze
 
         DARWIN_BREW_LIBS_31 = [["openssl@3", "ssl"], ["openssl@3", "crypto"]].freeze
 
-        DARWIN_DEP_LIBS = ["glog", "gflags", "brotlienc", "brotlidec", "brotlicommon"].freeze
+        DARWIN_DEP_LIBS_1 = ["folly", "fsst",   "metadata_thrift", "thrift_light", "xxhash", "zstd"].freeze
+        DARWIN_DEP_LIBS_2 = ["glog",  "gflags", "brotlienc",       "brotlidec",    "brotlicommon"].freeze
         # rubocop:enable Style/WordArray
 
+        COMMON_LINUX_LIBRARIES = [
+          "-l:libdwarfs-wr.a",    "-l:libtebako-fs.a",          "-l:libdwarfs.a",             "LIBCOMPRESSION",
+          "-l:libfolly.a",        "-l:libfsst.a",               "-l:libmetadata_thrift.a",    "-l:libthrift_light.a",
+          "-l:libxxhash.a",       "-l:libfmt.a",                "-l:libdouble-conversion.a",  "-l:libglog.a",
+          "-l:libgflags.a",       "-l:libevent.a"
+        ].freeze
+
+        COMMON_ARCHIEVE_LIBRARIES = [
+          "-l:libarchive.a",     "-l:liblz4.a",        "-l:libz.a",             "-l:libzstd.a",
+          "-l:libbrotlienc.a",   "-l:libbrotlidec.a",  "-l:libbrotlicommon.a",  "-l:liblzma.a"
+        ].freeze
+
+        LINUX_GNU_LIBRARIES = [
+          "-l:libiberty.a",      "-l:libacl.a",          "-l:libssl.a",           "-l:libcrypto.a",
+          "-l:libgdbm.a",        "-l:libreadline.a",     "-l:libtinfo.a",         "-l:libffi.a",
+          "-l:libncurses.a",     "-l:libjemalloc.a",     "-l:libcrypt.a",         "-l:libanl.a",
+          "LIBYAML",             "-l:libboost_system.a", "-l:libboost_chrono.a",  "-l:libutil.a",
+          "-l:libstdc++.a",      "-lgcc_eh",             "-l:libunwind.a",        "-l:liblzma.a",
+          "-l:librt.a",          "-ldl",                 "-lpthread",             "-lm"
+        ].freeze
+
+        LINUX_MUSL_LIBRARIES = [
+          "-l:libiberty.a",       "-l:libacl.a",          "-l:libssl.a",          "-l:libcrypto.a",
+          "-l:libreadline.a",     "-l:libgdbm.a",         "-l:libffi.a",          "-l:libncurses.a",
+          "-l:libjemalloc.a",     "-l:libcrypt.a",        "LIBYAML",              "-l:libboost_system.a",
+          "-l:libboost_chrono.a", "-l:librt.a",           "-l:libstdc++.a",       "-lgcc_eh",
+          " -l:libunwind.a",      "-l:liblzma.a",         "-ldl",                 "-lpthread"
+        ].freeze
+
+        MSYS_LIBRARIES = [
+          "-l:liblz4.a",             "-l:libz.a",             "-l:libzstd.a",            "-l:liblzma.a",
+          "-l:libncurses.a",         "-l:libunwind.a",        "-l:liblzma.a",            "-l:libiberty.a",
+          "LIBYAML",                 "-l:libffi.a",           "-l:libboost_system-mt.a", "-l:libboost_chrono-mt.a",
+          "-l:libstdc++.a",          "-l:libdl.a",            "-static-libgcc",          "-static-libstdc++",
+          "-l:libssl.a",             "-l:libcrypto.a",        "-l:libz.a",               "-l:libwinpthread.a",
+          "-lcrypt32",               "-lshlwapi",             "-lwsock32",               "-liphlpapi",
+          "-limagehlp",              "-lbcrypt",              "-lole32",                 "-loleaut32",
+          "-luuid",                  "-lws2_32"
+        ].freeze
+
+        def linux_gnu_libraries(ruby_ver, with_compression)
+          libraries = COMMON_LINUX_LIBRARIES + COMMON_ARCHIEVE_LIBRARIES + LINUX_GNU_LIBRARIES
+          linux_libraries(libraries, ruby_ver, with_compression)
+        end
+
+        def linux_musl_libraries(ruby_ver, with_compression)
+          libraries = COMMON_LINUX_LIBRARIES + COMMON_ARCHIEVE_LIBRARIES + LINUX_MUSL_LIBRARIES
+          linux_libraries(libraries, ruby_ver, with_compression)
+        end
+
+        def linux_libraries(libraries, ruby_ver, with_compression)
+          libraries.map! do |lib|
+            if lib == "LIBYAML"
+              PatchHelpers.yaml_reference(ruby_ver)
+            elsif lib == "LIBCOMPRESSION"
+              with_compression ? "-Wl,--push-state,--whole-archive -l:libdwarfs_compression.a -Wl,--pop-state" : ""
+            else
+              lib
+            end
+          end
+          libraries.join(" ")
+        end
+
+        def msys_libraries(ruby_ver, with_compression)
+          libraries = with_compression ? ["-Wl,-Bstatic"] : []
+          libraries = libraries + COMMON_LINUX_LIBRARIES + MSYS_LIBRARIES
+          linux_libraries(libraries, ruby_ver, with_compression)
+        end
+
         def process_brew_libs!(libs, brew_libs)
           brew_libs.each { |lib| libs << "#{PatchHelpers.get_prefix_macos(lib[0]).chop}/lib/lib#{lib[1]}.a " }
         end
 
-        def darwin_libs(deps_lib_dir, ruby_ver)
+        def darwin_libraries(deps_lib_dir, ruby_ver, with_compression)
           libs = String.new
 
+          DARWIN_DEP_LIBS_1.each { |lib| libs << "#{deps_lib_dir}/lib#{lib}.a " }
           process_brew_libs!(libs, PatchHelpers.ruby31?(ruby_ver) ? DARWIN_BREW_LIBS_31 : DARWIN_BREW_LIBS_PRE_31)
           process_brew_libs!(libs, DARWIN_BREW_LIBS)
 
-          DARWIN_DEP_LIBS.each { |lib| libs << "#{deps_lib_dir}/lib#{lib}.a " }
-          <<~SUBST
-            -ltebako-fs -ldwarfs-wr -ldwarfs -force_load #{deps_lib_dir}/libdwarfs_compression.a -lfolly -lfsst -lmetadata_thrift -lthrift_light -lxxhash \
-            -lzstd #{libs} -ljemalloc -lc++ -lc++abi
-          SUBST
+          DARWIN_DEP_LIBS_2.each { |lib| libs << "#{deps_lib_dir}/lib#{lib}.a " }
+
+          compression_lib = with_compression ? "-force_load #{deps_lib_dir}/libdwarfs_compression.a" : ""
+          "-ltebako-fs -ldwarfs-wr -ldwarfs #{compression_lib} #{libs} -ljemalloc -lc++ -lc++abi"
         end
 
         # .....................................................
@@ -79,66 +146,16 @@ module Tebako
         #      This is fixed by ext/extmk.rb patch [TODO ?]
         # .....................................................
 
-        def linux_common_libs
-          <<~SUBST
-            -l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.a -Wl,--push-state,--whole-archive -l:libdwarfs_compression.a -Wl,--pop-state -l:libfolly.a -l:libfsst.a           \\
-            -l:libmetadata_thrift.a -l:libthrift_light.a -l:libxxhash.a -l:libfmt.a -l:libdouble-conversion.a -l:libglog.a -l:libgflags.a -l:libevent.a                         \\
-          SUBST
-        end
-
-        def common_enc_libs
-          "-l:liblz4.a -l:libz.a -l:libzstd.a -l:libbrotlienc.a -l:libbrotlidec.a -l:libbrotlicommon.a -l:liblzma.a"
-        end
-
-        def linux_gnu_libs(ruby_ver)
-          <<~SUBST
-            #{linux_common_libs} \
-            -l:libarchive.a -l:libiberty.a -l:libacl.a -l:libssl.a -l:libcrypto.a #{common_enc_libs} \\
-            -l:libgdbm.a -l:libreadline.a -l:libtinfo.a -l:libffi.a -l:libncurses.a -l:libjemalloc.a -l:libcrypt.a -l:libanl.a #{PatchHelpers.yaml_reference(ruby_ver)} \\
-            -l:libboost_system.a -l:libboost_chrono.a -l:libutil.a -l:libstdc++.a -lgcc_eh -l:libunwind.a -l:liblzma.a -l:librt.a -ldl -lpthread -lm
-          SUBST
-        end
-
-        def linux_musl_libs(ruby_ver)
-          <<~SUBST
-            #{linux_common_libs} \
-            -l:libiberty.a  -l:libacl.a -l:libssl.a -l:libcrypto.a #{common_enc_libs} -l:libreadline.a  \\
-            -l:libgdbm.a  -l:libffi.a -l:libncurses.a -l:libjemalloc.a -l:libcrypt.a  #{PatchHelpers.yaml_reference(ruby_ver)} -l:libboost_system.a -l:libboost_chrono.a \\
-            -l:librt.a -l:libstdc++.a -lgcc_eh -l:libunwind.a -l:liblzma.a -ldl -lpthread
-          SUBST
-        end
-
-        # Used for mkconfig.rb
-        def msys_base_libs(ruby_ver)
-          <<~SUBST
-            "-l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.a -l:libdwarfs_compression.a -l:libfolly.a -l:libfsst.a "          \\
-            "-l:libmetadata_thrift.a -l:libthrift_light.a -l:libxxhash.a -l:libfmt.a -l:libdouble-conversion.a -l:libglog.a -l:libgflags.a -l:libevent.a " \\
-            "-l:liblz4.a -l:libz.a -l:libzstd.a -l:liblzma.a -l:libncurses.a -l:libunwind.a -l:liblzma.a -l:libiberty.a #{PatchHelpers.yaml_reference(ruby_ver)} " \\
-            "-l:libffi.a -l:libboost_system-mt.a -l:libboost_chrono-mt.a -l:libstdc++.a -l:libdl.a -static-libgcc -static-libstdc++ -l:libssl.a -l:libcrypto.a " \\
-            "-l:libz.a -l:libwinpthread.a -lcrypt32 -lshlwapi -lwsock32 -liphlpapi -limagehlp -lbcrypt -lole32 -loleaut32 -luuid"
-          SUBST
-        end
-
-        # Used in Makefile
-        def msys_libs(ruby_ver)
-          <<~SUBST
-            -Wl,-Bstatic #{linux_common_libs} \
-            -l:liblz4.a -l:libz.a -l:libzstd.a -l:liblzma.a -l:libncurses.a -l:libunwind.a -l:liblzma.a -l:libiberty.a #{PatchHelpers.yaml_reference(ruby_ver)}            \\
-            -l:libffi.a -l:libboost_system-mt.a -l:libboost_chrono-mt.a -l:libstdc++.a -l:libdl.a -static-libgcc -static-libstdc++ -l:libssl.a -l:libcrypto.a -l:libz.a    \\
-            -l:libwinpthread.a -lcrypt32 -lshlwapi -lwsock32 -liphlpapi -limagehlp -lshlwapi -lbcrypt -lws2_32 -lole32 -loleaut32 -luuid
-          SUBST
-        end
-
-        def mlibs(ostype, deps_lib_dir, ruby_ver) # rubocop:disable Metrics/MethodLength
+        def mlibs(ostype, deps_lib_dir, ruby_ver, with_compression) # rubocop:disable Metrics/MethodLength
           case ostype
           when /linux-gnu/
-            linux_gnu_libs(ruby_ver)
+            linux_gnu_libraries(ruby_ver, with_compression)
           when /linux-musl/
-            linux_musl_libs(ruby_ver)
+            linux_musl_libraries(ruby_ver, with_compression)
           when /darwin/
-            darwin_libs(deps_lib_dir, ruby_ver)
+            darwin_libraries(deps_lib_dir, ruby_ver, with_compression)
           when /msys/
-            msys_libs(ruby_ver)
+            msys_libraries(ruby_ver, with_compression)
           else
             raise Tebako::Error, "Unknown ostype #{ostype}"
           end

data/lib/tebako/packager/patch_literals.rb

@@ -30,25 +30,23 @@ module Tebako
   module Packager
     # Ruby patching literals (pass2)
     module PatchLiterals
-      TOOL_MKCONFIG_RB_PATCH = {
-        "    if fast[name]" => <<~SUBST
-          # -- Start of tebako patch --
-              v_head_comp = "  CONFIG[\\"prefix\\"] \#{eq} "
-              if v_head_comp == v[0...(v_head_comp.length)]
-                  v = "\#{v[0...(v_head_comp.length)]}'/__tebako_memfs__'
-          "
-              end
-              v_head_comp = "  CONFIG[\\"RUBY_EXEC_PREFIX\\"] \#{eq} "
-              if v_head_comp == v[0...(v_head_comp.length)]
+      TOOL_MKCONFIG_RB_SUBST = <<~SUBST
+        # -- Start of tebako patch --
+            v_head_comp = "  CONFIG[\\"prefix\\"] \#{eq} "
+            if v_head_comp == v[0...(v_head_comp.length)]
                 v = "\#{v[0...(v_head_comp.length)]}'/__tebako_memfs__'
-          "
-              end
-          # -- End of tebako patch --
-              if fast[name]
-        SUBST
-      }.freeze
+        "
+            end
+            v_head_comp = "  CONFIG[\\"RUBY_EXEC_PREFIX\\"] \#{eq} "
+            if v_head_comp == v[0...(v_head_comp.length)]
+              v = "\#{v[0...(v_head_comp.length)]}'/__tebako_memfs__'
+        "
+            end
+        # -- End of tebako patch --
+            if fast[name]
+      SUBST
 
-      TOOLS_MKCONFIG_RB_SUBST = <<~SUBST
+      TOOL_MKCONFIG_RB_SUBST_MSYS = <<~SUBST
         # -- Start of tebako patch --
             v_head_comp = "  CONFIG[\\"prefix\\"] \#{eq} "
             if v_head_comp == v[0...(v_head_comp.length)]

data/lib/tebako/version.rb

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

data/src/tebako-main.cpp

@@ -156,3 +156,10 @@ extern "C" const char* tebako_mount_point(void) {
 extern "C" int tebako_is_running_miniruby(void) {
 	return running_miniruby;
 }
+
+#ifdef RB_W32_PRE_33
+extern "C" ssize_t rb_w32_pread(int /* fd */, void* /* buf */, size_t /* size */, size_t /* offset */)
+{
+  return -1;
+}
+#endif

data/version.txt

@@ -1 +1 @@
-0.7.4
+0.8.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -115,7 +115,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/tamatebako/tebako
   source_code_uri: https://github.com/tamatebako/tebako
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - cmake
@@ -139,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.3.27
+signing_key: 
 specification_version: 4
 summary: Packager for Ruby executables
 test_files: []