rbe-tebako 0.16.0 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d051f3caca43f3080ba1793827fe2390b7a9410ed53cd8c5426856c70592cd9
-  data.tar.gz: 9466ae396ba0171287dd792fb99cc58995aa76b750772b146f92687f862e28e1
+  metadata.gz: ae8e7d799dcd1f708aae6e207f52209723ddc002d974630329f366f5868e4969
+  data.tar.gz: 43fde362f15747f05c1ac17c6d87e642fb6726cf63aad5518631b61b79349d2d
 SHA512:
-  metadata.gz: d3bcdf7fd8770090d25ca313808091f3785c5fbac4015af47a6bd745acaae341efcd9381225eeae1dd1d986cfcb4ad895d92c4215586e338c1127be8a9004c15
-  data.tar.gz: 6151c0a0d960ef89d768a3510400a6bd4ba2fa01b4756e224222e026cc776ad2ddf17978bc9b561a230251c6ffa191ec0833c31cea717cd0db499507b1c705c8
+  metadata.gz: d4544ed4430fa4c6feebeca5faed6aae71a5e1b8059760d0cd3eae4ca0b9bfc6058f48606dba2ee050b728a7eb7ceca1bf4d965b51a9f118ceff84c4456bb0c8
+  data.tar.gz: 92100591623e76a5078ff059d54b8071443a6bd1bd9e7a8bfd8879c7c511d325fb937984ee228045025a136b469aefb1c4446eab9d56d293968f85159035cdae

data/Brewfile

@@ -1,23 +1,30 @@
-# frozen_string_literal: true
-
-brew "zlib"
-brew "ncurses"
-brew "libevent"
-brew "libsodium"
-brew "lz4"
-brew "xz"
-brew "gdbm"
-brew "pkg-config"
-brew "libyaml"
-brew "curl"
-brew "bison"
-brew "flex"
-brew "binutils"
-brew "libffi"
-brew "double-conversion"
-brew "boost"
-brew "jemalloc"
-brew "fmt"
-brew "glog"
-brew "gnu-sed"
-brew "bash"
+# frozen_string_literal: true
+
+brew "zlib"
+brew "openssl@3"
+brew "ncurses"
+brew "readline"
+brew "libevent"
+brew "libsodium"
+brew "lz4"
+brew "xz"
+brew "gdbm"
+brew "pkg-config"
+brew "libyaml"
+brew "curl"
+brew "bison"
+brew "flex"
+brew "binutils"
+brew "libffi"
+brew "double-conversion"
+brew "boost"
+brew "xxhash"
+brew "zstd"
+brew "brotli"
+brew "flac"
+brew "libogg"
+brew "jemalloc"
+brew "fmt"
+brew "glog"
+brew "gnu-sed"
+brew "bash"

data/include/tebako/tebako-fs.h

@@ -29,6 +29,7 @@
 
 #pragma once
 
+#define INCBIN_SILENCE_BITCODE_WARNING
 #include <incbin/incbin.h>
 
 INCBIN_EXTERN(fs);

data/lib/tebako/packager/patch_libraries.rb

@@ -32,7 +32,7 @@ module Tebako
   module Packager
     # Ruby patching definitions (pass2)
     module PatchLibraries
-      class << self
+      class << self # rubocop:disable Metrics/ClassLength
         # rubocop:disable Style/WordArray
         DARWIN_BREW_LIBS = [
           ["zlib", "z"],              ["gdbm", "gdbm"],           ["readline", "readline"], ["libffi", "ffi"],
@@ -40,13 +40,14 @@ module Tebako
           ["boost", "boost_chrono"],  ["double-conversion", "double-conversion"],
           # DwarFS v0.15 compression/hash deps (were staged into deps_lib_dir under the bridge)
           ["xxhash", "xxhash"],               ["zstd", "zstd"],
-          ["brotli", "brotlienc"],            ["brotli", "brotlidec"],            ["brotli", "brotlicommon"],
+          ["brotli", "brotlienc"],            ["brotli", "brotlidec"], ["brotli", "brotlicommon"],
           # DwarFS reader link deps
           ["boost", "boost_filesystem"],      ["boost", "boost_atomic"],
           ["boost", "boost_iostreams"],       ["boost", "boost_program_options"],
           ["boost", "boost_context"],         ["boost", "boost_regex"],
           ["boost", "boost_thread"],
-          ["flac", "FLAC"],                   ["flac", "FLAC++"],
+          ["fmt", "fmt"],
+          ["flac", "FLAC"], ["flac", "FLAC++"],
           ["libogg", "ogg"]
         ].freeze
 
@@ -55,8 +56,8 @@ module Tebako
         DARWIN_BREW_LIBS_31 = [["openssl@3", "ssl"], ["openssl@3", "crypto"]].freeze
 
         # DwarFS v0.15 split static libs (installed to deps_lib_dir by libdwarfs). folly/fbthrift
-        # are gone; the thrift/fsst/frozen libs are now real .a files. glog/gflags/fmt are no
-        # longer linked (fmt is header-only / baked into the DwarFS libs).
+        # are gone; the thrift/fsst/frozen libs are now real .a files. glog/gflags are no longer
+        # linked. fmt remains a compiled dependency of the DwarFS reader/common archives.
         DARWIN_DEP_LIBS_1 = [
           "dwarfs_reader", "dwarfs_common",
           "dwarfs_fsst", "dwarfs_frozen", "dwarfs_thrift_lite_v2",
@@ -139,7 +140,7 @@ module Tebako
           brew_libs.each { |lib| libs << "#{PatchHelpers.get_prefix_macos(lib[0]).chop}/lib/lib#{lib[1]}.a " }
         end
 
-        def darwin_libraries(deps_lib_dir, ruby_ver, with_compression)
+        def darwin_libraries(deps_lib_dir, ruby_ver, with_compression) # rubocop:disable Metrics/MethodLength
           libs = String.new
 
           DARWIN_DEP_LIBS_1.each { |lib| libs << "#{deps_lib_dir}/lib#{lib}.a " }
@@ -151,7 +152,7 @@ module Tebako
           compression_lib =
             if with_compression
               "-force_load #{deps_lib_dir}/libdwarfs_decompressor.a " \
-              "-force_load #{deps_lib_dir}/libdwarfs_compressor.a"
+                "-force_load #{deps_lib_dir}/libdwarfs_compressor.a"
             else
               ""
             end

data/lib/tebako/ruby_builder.rb

@@ -107,12 +107,31 @@ module Tebako
           "-f",
           "exts.mk",
           "tebako-bundle",
+          "EXTENCS=#{enc_link_objects.join(" ")}",
           "TEBAKO_BUNDLE_OUTPUT=#{build_name}",
           "TEBAKO_APPLICATION_LDFLAGS=#{application_link_flags(application)}"
         )
       end
     end
 
+    # exts.mk's SUBMAKEOPTS folds $(EXTENCS) into the EXTOBJS it hands the
+    # sub-make. Ruby's own build supplies it (common.mk build-ext passes
+    # EXTENCS="$(ENCOBJS)"); invoked standalone the variable expands empty,
+    # the static encoding objects drop out of the link, and libruby-static.a's
+    # dmyenc.o (a no-op Init_enc) satisfies the symbol instead. The resulting
+    # binary boots with only builtin encodings and NO Encoding constants, and
+    # the first extension that looks up Encoding::UTF_8 (json) dies with
+    # NameError.
+    def enc_link_objects
+      objects = ["enc/encinit.o", "enc/libenc.a", "enc/libtrans.a"]
+      missing = objects.reject { |path| File.file?(File.join(@src_dir, path)) }
+      unless missing.empty?
+        raise Tebako::Error.new("static encoding objects missing from Ruby build: #{missing.join(", ")}", 120)
+      end
+
+      objects
+    end
+
     def publish_application_link(output, target, build_target)
       raise Tebako::Error.new("macOS application link did not create #{output}", 120) unless File.file?(build_target)
 

data/lib/tebako/single_file_bundle_builder.rb

@@ -68,6 +68,10 @@ module Tebako
       return if File.file?(marker) && File.binread(marker) == @runtime_identity
 
       base = File.join(@opts.output_folder, "bundle-work", output_identity, "macho-link-runtime")
+      # The runtime build's final strip writes here with `strip -o`, which
+      # cannot create missing directories — without this, a fresh identity dir
+      # produces a "could not strip" warning and no byproduct file.
+      FileUtils.mkdir_p(File.dirname(base))
       Tebako::RuntimeBuilder.new(runtime_options(base), @scm).build
     end
 

data/lib/tebako/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbe-tebako
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.2
 platform: ruby
 authors:
 - Andrea Fomera
@@ -310,7 +310,7 @@ licenses:
 - BSD-2-Clause
 metadata:
   homepage_uri: https://github.com/RubyEverywhere/tebako
-  source_code_uri: https://github.com/RubyEverywhere/tebako/tree/v0.16.0
+  source_code_uri: https://github.com/RubyEverywhere/tebako/tree/v0.16.2
   allowed_push_host: https://rubygems.org
 rdoc_options: []
 require_paths:
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.13
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Packager for Ruby executables (RubyEverywhere fork of tebako)
 test_files: []