tebako 0.7.3 → 0.8.0

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.5
 RUBY_VER=3.1.6

data/exe/tebako-packager

@@ -48,26 +48,7 @@ begin
     end
 
     Tebako::Packager.pass1(ARGV[1], ARGV[2], ARGV[3], ARGV[4], ARGV[5])
-  when "stash"
-    #       ARGV[0] -- command
-    #       ARGV[1] -- DATA_SRC_DIR
-    #       ARGV[2] -- RUBY_STASH_DIR
-    unless ARGV.length == 3
-      raise Tebako::Error,
-            "tebako-packager stash command expects 3 arguments, #{ARGV.length} has been provided."
-    end
-
-    Tebako::Packager.stash(ARGV[1], ARGV[2])
-  when "strip"
-    #       ARGV[0] -- command
-    #       ARGV[1] -- OSTYPE
-    #       ARGV[2] -- DATA_SRC_DIR
-    unless ARGV.length == 3
-      raise Tebako::Error,
-            "tebako-packager strip command expects 3 arguments, #{ARGV.length} has been provided."
-    end
 
-    Tebako::Stripper.strip(ARGV[1], ARGV[2])
   when "pass1a"
     #       ARGV[0] -- command
     #       ARGV[1] -- RUBY_SOURCE_DIR
@@ -114,6 +95,16 @@ begin
     # That shall match CMakeLists.txt settings
     Tebako::Packager.deploy(ARGV[1], ARGV[4], ARGV[5], ARGV[11], ARGV[7], ARGV[8], ARGV[9])
 
+  when "finalize"
+    #       ARGV[0] -- command
+    #       ARGV[1] -- OSTYPE
+    #       ARGV[2] -- RUBY_SOURCE_DIR
+    #       ARGV[3] -- APP_NAME
+    unless ARGV.length == 4
+      raise Tebako::Error,
+            "tebako-packager finalize command expects 4 arguments, #{ARGV.length} has been provided."
+    end
+    Tebako::Packager.finalize(ARGV[1], ARGV[2], ARGV[3])
   else
     raise Tebako::Error, "tebako-packager cannot process #{ARGV[0]} command"
   end
@@ -121,5 +112,4 @@ rescue Tebako::Error => e
   puts "tebako-packager failed: #{e.message} [#{e.error_code}]"
   exit(e.error_code)
 end
-
 exit(0)

data/lib/tebako/cli.rb

@@ -61,8 +61,8 @@ module Tebako
     def clean_ruby
       puts "Cleaning Ruby sources from tebako packaging environment"
       suffix = options["Ruby"].nil? ? "" : "_#{options["Ruby"]}"
-      nmr = "src/_ruby_#{suffix}*"
-      nms = "stash_#{suffix}"
+      nmr = "src/_ruby#{suffix}*"
+      nms = "stash#{suffix}*"
       FileUtils.rm_rf(Dir.glob(File.join(deps, nmr)), secure: true)
       FileUtils.rm_rf(Dir.glob(File.join(deps, nms)), secure: true)
     end

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/deploy_helper.rb

@@ -29,6 +29,7 @@ require "fileutils"
 require "find"
 
 require_relative "error"
+require_relative "packager/patch_helpers"
 
 # Tebako - an executable packager
 module Tebako
@@ -65,11 +66,16 @@ module Tebako
     end
 
     def deploy
-      system("#{gem_command} env")
-      install_gem("tebako-runtime")
-      install_gem("bundler", Tebako::BUNDLER_VERSION) if needs_bundler?
-
-      deploy_solution
+      Packager::PatchHelpers.with_env(deploy_env) do
+        unless Packager::PatchHelpers.ruby31?(@ruby_ver)
+          update_rubygems
+          patch_after_rubygems_update(@target_dir, @ruby_api_version)
+        end
+        system("#{gem_command} env")
+        install_gem("tebako-runtime")
+        install_gem("bundler", BUNDLER_VERSION) if needs_bundler?
+        deploy_solution
+      end
     end
 
     def deploy_env
@@ -264,6 +270,13 @@ module Tebako
                   end
     end
 
+    def patch_after_rubygems_update(target_dir, ruby_api_ver)
+      # Autoload cannot handle statically linked openssl extension
+      # Changing it to require seems to be the simplest solution
+      Packager::PatchHelpers.patch_file("#{target_dir}/lib/ruby/site_ruby/#{ruby_api_ver}/rubygems/openssl.rb",
+                                        { "autoload :OpenSSL, \"openssl\"" => "require \"openssl\"" })
+    end
+
     def run_with_capture(args)
       puts "   ... @ #{args.join(" ")}"
       out, st = Open3.capture2e(*args)

data/lib/tebako/packager/pass1.rb

@@ -178,13 +178,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 \\",
 
-            "	@rm -f $(PROGRAM)" =>
-              "# tebako patched  @rm -f $(PROGRAM)",
+            "--export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)" =>
+              "--export-all $(LIBRUBY_A) $(LIBS) -o program-stub.exe   # tebako patched",
+
+            "@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

@@ -62,10 +62,18 @@ module Tebako
           out
         end
 
+        def exe_suffix(ostype)
+          msys?(ostype) ? ".exe" : ""
+        end
+
         def msys?(ostype)
           ostype =~ /msys|cygwin|mingw/
         end
 
+        def macos?(ostype)
+          ostype =~ /darwin/
+        end
+
         def patch_c_file_pre(pattern)
           {
             pattern => "#{PatchLiterals::C_FILE_SUBST}\n#{pattern}"
@@ -108,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

@@ -40,32 +40,101 @@ module Tebako
         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"]
+          ["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 = [["libyaml", "yaml"], ["openssl@3", "ssl"], ["openssl@3", "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
 
         # .....................................................
@@ -80,66 +149,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/packager.rb

@@ -31,6 +31,7 @@ require "pathname"
 
 require_relative "error"
 require_relative "deploy_helper"
+require_relative "stripper"
 require_relative "packager/pass1"
 require_relative "packager/pass1a"
 require_relative "packager/pass2"
@@ -79,14 +80,22 @@ module Tebako
 
         deploy_helper = Tebako::DeployHelper.new(fs_root, fs_entrance, fs_mount_point, target_dir, pre_dir)
         deploy_helper.config(os_type, ruby_ver)
+        deploy_helper.deploy
+        Tebako::Stripper.strip(os_type, target_dir)
+      end
 
-        PatchHelpers.with_env(deploy_helper.deploy_env) do
-          unless PatchHelpers.ruby31?(ruby_ver)
-            deploy_helper.update_rubygems
-            patch_after_rubygems_update(target_dir, deploy_helper.ruby_api_version)
-          end
-          deploy_helper.deploy
+      def finalize(os_type, src_dir, app_name)
+        exe_suffix = Packager::PatchHelpers.exe_suffix(os_type)
+        src_name = File.join(src_dir, "ruby#{exe_suffix}")
+        package_name = "#{app_name}#{exe_suffix}"
+        # [TODO] On MSys strip sometimes creates a broken executable
+        # https://github.com/tamatebako/tebako/issues/172
+        if Packager::PatchHelpers.msys?(os_type)
+          FileUtils.cp(src_name, package_name)
+        else
+          Tebako::Stripper.strip_file(src_name, package_name)
         end
+        puts "Created tebako package at \"#{package_name}\""
       end
 
       # Init
@@ -188,13 +197,6 @@ module Tebako
         end
         ruby_version
       end
-
-      def patch_after_rubygems_update(target_dir, ruby_api_ver)
-        # Autoload cannot handle statically linked openssl extension
-        # Changing it to require seems to be the simplest solution
-        PatchHelpers.patch_file("#{target_dir}/lib/ruby/site_ruby/#{ruby_api_ver}/rubygems/openssl.rb",
-                                { "autoload :OpenSSL, \"openssl\"" => "require \"openssl\"" })
-      end
     end
   end
 end