tebako 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b93ceda3b8a6329b0a332f3ebfbf4c24ff030eda6c1727109623a98bbf868eae
-  data.tar.gz: 78e53009d65e1841a8c706b3be9fcbe17f7976864d23e5f70bf07357f3f2701f
+  metadata.gz: 22aea474f49445f022530cf4cc3c16c2bce29da88bb1c3bc0c4d0a64838676a8
+  data.tar.gz: 3f3efc915bcde108bdd14b6f21946cf6c2e20edc7d48e2703db54f9ea9ed5dfb
 SHA512:
-  metadata.gz: c256ed82865bea01ac84c9c5bc33f7ef0c99df2d143eb78ac1f6b486492d42affb10fe14f590665a7a00b2c397ae57d9ba7cd3c52b6742b5740965340eeb1c77
-  data.tar.gz: 2d5dd78d7ccdf95f06b7453b4939ebc81e759242fbf37259edd95e598901adc6a5af6828cf1c57c081c7c7f487c6a4609e3f1c8d2b59e070a5be0869448781f1
+  metadata.gz: 78be29f984b8505a537327970820f91151411dde2fd0bbb6d760741cd373e61324d1b225ca2e1792f22f53b32a52ad0b3bcfa8c23ec7ede3df221c6435d8cb45
+  data.tar.gz: 13f0505477b14079016a48c83f44da433dcabf1858ea99ae2e8ab3892d7231493d5d46f02defdf57908ad5b652c6b8713d5ef0129b25ae979798bc549e3442f7

data/CMakeLists.txt

@@ -172,14 +172,37 @@ elseif("${OSTYPE_TXT}" MATCHES "^msys*")
   set(RUBY_MAKEFILE "--file=GNUmakefile")
 elseif("${OSTYPE_TXT}" MATCHES "^darwin.*")
   set(IS_DARWIN ON)
-  if(${RUBY_VER} VERSION_LESS "3.2.0")
+  if(${RUBY_VER} VERSION_LESS "3.1.0")
     set(OPENSSL_VER "1.1")
-  else(${RUBY_VER} VERSION_LESS "3.2.0")
+  else(${RUBY_VER} VERSION_LESS "3.1.0")
     set(OPENSSL_VER "3")
-  endif(${RUBY_VER} VERSION_LESS "3.2.0")
+  endif(${RUBY_VER} VERSION_LESS "3.1.0")
   set(BUILD_OPENSSL_ROOT_DIR "${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
 endif()
 
+if(IS_DARWIN)
+  execute_process(
+    COMMAND "sysctl" "-n" "hw.ncpu"
+    RESULT_VARIABLE NCORES_RES
+    OUTPUT_VARIABLE NCORES
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+else(IS_DARWIN)
+  execute_process(
+    COMMAND "nproc" "--all"
+    RESULT_VARIABLE NCORES_RES
+    OUTPUT_VARIABLE NCORES
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+endif(IS_DARWIN)
+
+if(NCORES_RES EQUAL 0)
+  message(STATUS "NCORES: ${NCORES}")
+else(NCORES_RES EQUAL 0)
+  set(NCORES 4)
+  message(WARNING "Failed to detect NCORES, resetting to ${NCORES} (default)")
+endif(NCORES_RES EQUAL 0)
+
 # Various locations for external projects
 set(DEPS ${CMAKE_CURRENT_SOURCE_DIR}/deps CACHE STRING "Dependencies' folder'")
 set(DEPS_INCLUDE_DIR ${DEPS}/include)
@@ -220,7 +243,7 @@ if(IS_MSYS)
 endif(IS_MSYS)
 
 def_ext_prj_g(INCBIN "348e36b")
-def_ext_prj_g(DWARFS_WR "v0.3.5")
+def_ext_prj_g(DWARFS_WR "v0.4.0")
 
 if (DEFINED ENV{BUNDLER_VER})
  set(BUNDLER_VER $ENV{BUNDLER_VER})
@@ -363,7 +386,7 @@ ExternalProject_Add(${DWARFS_WR_PRJ}
     SOURCE_DIR ${DWARFS_WR_SOURCE_DIR}
     BINARY_DIR ${DWARFS_WR_BINARY_DIR}
     UPDATE_COMMAND ""
-    BUILD_COMMAND ${CMAKE_COMMAND} --build ${DWARFS_WR_BINARY_DIR} --parallel 4
+    BUILD_COMMAND ${CMAKE_COMMAND} --build ${DWARFS_WR_BINARY_DIR} --parallel ${NCORES}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${DEPS}
                -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                -DWITH_TESTS:BOOL=OFF
@@ -418,15 +441,17 @@ if(IS_DARWIN)
   string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/lib -L${BUILD_BREW_PREFIX}/opt/zlib/lib  -L${BUILD_BREW_PREFIX}/lib")
   set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
   set(C_FLAGS_DEST cflags)
-endif(IS_DARWIN)
+else(IS_DARWIN)
+  string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -static-libgcc")
 
-if(IS_MUSL)
-  string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DENABLE_PATH_CHECK=0")
-endif(IS_MUSL)
+  if(IS_MUSL)
+    string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DENABLE_PATH_CHECK=0")
+  endif(IS_MUSL)
 
-if(RB_W32)
-  string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DRB_W32=1")
-endif(RB_W32)
+  if(RB_W32)
+    string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DRB_W32=1")
+  endif(RB_W32)
+endif(IS_DARWIN)
 
 message(STATUS "Ruby build ${C_FLAGS_DEST}='${RUBY_C_FLAGS}'")
 message(STATUS "Ruby build LDFLAGS='${RUBY_L_FLAGS}'")
@@ -452,7 +477,7 @@ ExternalProject_Add(${RUBY_PRJ}
                                                         --prefix=${DATA_SRC_DIR}              \
                                                         ${C_FLAGS_DEST}=\"${RUBY_C_FLAGS}\"   \
                                                         LDFLAGS=\"${RUBY_L_FLAGS}\""
-  BUILD_COMMAND    make ${RUBY_MAKEFILE}
+  BUILD_COMMAND    make ${RUBY_MAKEFILE} -j${NCORES}
   INSTALL_COMMAND  make ${RUBY_MAKEFILE} install
   COMMAND          ruby ${EXE}/tebako-packager pass2 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${DEPS_LIB_DIR} ${DATA_SRC_DIR} ${RUBY_STASH_DIR} ${RUBY_VER}
 )
@@ -555,15 +580,14 @@ else (${SETUP_MODE})
        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
                                            ${TBD}/bundle${CMD_SUFFIX} config set --local force_ruby_platform ${FORCE_RUBY_PLATFORM}
        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                           ${TBD}/bundle${CMD_SUFFIX} install --jobs=4
+                                           ${TBD}/bundle${CMD_SUFFIX} install --jobs=${NCORES}
 #       COMMAND_EXPAND_LISTS
 # [TODO] Open question - how to deploy a project to source filesystem
 #        ruby packer does bundle install --deployment --binstubs
-# [TODO] --jobs=4 probably can be more intellectual
 #       COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
 #                                    ${TBD}/bundle lock
 #       COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-#                                    ${TBD}/bundle install --deployment --jobs=4
+#                                    ${TBD}/bundle install --deployment --jobs=${NCORES}
         DEPENDS clean_filesystem
     )
   elseif(GLENGTH GREATER 0)
@@ -663,12 +687,12 @@ else (${SETUP_MODE})
 
   if (${RUBY_VER} VERSION_LESS "3.0.0")
     add_custom_target(patched_ruby
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ${RUBY_MAKEFILE}
+      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ${RUBY_MAKEFILE} -j${NCORES}
     )
   else()
     add_custom_target(patched_ruby
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ruby ${RUBY_MAKEFILE}
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ${RUBY_MAKEFILE}
+      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ruby ${RUBY_MAKEFILE} -j${NCORES}
+      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ${RUBY_MAKEFILE} -j${NCORES}
     )
   endif()
 

data/Rakefile

@@ -36,7 +36,7 @@ desc "Generate version.txt"
 task "generate_version_txt" do
   require_relative "lib/tebako/version"
   File.write(File.join(__dir__, "version.txt"), "#{Tebako::VERSION}\n")
-  puts "Generating version.txt #{Tebako::VERSION} --> #{File.join(__dir__, "version.txt")}"
+  puts "Generating #{File.join(__dir__, "version.txt")}; version = #{Tebako::VERSION}"
 end
 
 task build: :generate_version_txt

data/common.env

@@ -1,6 +1,6 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.3.5
+DWARFS_WR_TAG=v0.4.0
 BUNDLER_VER=2.3.22
 RUBY_VER=3.1.4

data/lib/tebako/cli_helpers.rb

@@ -44,8 +44,6 @@ module Tebako
                 else
                   ENV.fetch("CXXFLAGS", nil)
                 end
-      #      cc = ENV.fetch("CC", "gcc")
-      #      cxx = ENV.fetch("CXX", "g++")
       @b_env ||= { "CXXFLAGS" => u_flags }
     end
 

data/lib/tebako/packager/pass2.rb

@@ -42,6 +42,7 @@ module Tebako
           patch_map.store("common.mk", COMMON_MK_PATCH) if PatchHelpers.ruby3x?(ruby_ver)
 
           ostype =~ /msys/ ? patch_map.merge!(MSYS_PATCHES) : patch_map
+          #          patch_map.merge!(LINUX_PATCHES)
         end
 
         private
@@ -64,35 +65,51 @@ module Tebako
         end
 
         def process_brew_libs!(libs, brew_libs)
-          brew_libs.each { |lib| libs << "#{PatchHelpers.get_prefix(lib[0]).chop}/lib/lib#{lib[1]}.a " }
+          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)
           libs = String.new
+
+          process_brew_libs!(libs, PatchHelpers.ruby31?(ruby_ver) ? DARWIN_BREW_LIBS_31 : DARWIN_BREW_LIBS_PRE_31)
           process_brew_libs!(libs, DARWIN_BREW_LIBS)
-          process_brew_libs!(libs, DARWIN_BREW_LIBS_32) if PatchHelpers.ruby32?(ruby_ver)
+
           DARWIN_DEP_LIBS.each { |lib| libs << "#{deps_lib_dir}/lib#{lib}.a " }
           <<~SUBST
-            -ltebako-fs -ldwarfs-wr -ldwarfs -lfolly -lfsst -lmetadata_thrift -lthrift_light -lxxhash \
-            -lzstd #{libs} -ljemalloc -lc++
+            -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
         end
 
+        # .....................................................
+        #  Notes re linux libraries
+        #   1) This order is important: -lgcc_eh -l:libunwind.a -l:liblzma.a  lzma is used to process debug sections.
+        #      gcc_eh shall be linked before unwind to avoid duplicate symbols.
+        #   2) -lgcc_eh assumes -static-libgcc (applied in CMakeLists.ext, RUBY_C_FLAGS)
+        #   3) -static-libstdc++ did not work, not sure why  [TODO ?]
+        #   4) When clang is used linker links libraries specified in exensions in such way that they are linked shared
+        #      (libz, libffi, libreadline, libncurses, libtinfo, ... )
+        #      Using stuff like -l:libz.a  does not help; there is a reference to libz.so anyway.
+        #      This is fixed by ext/extmk.rb patch [TODO ?]
+        # .....................................................
+
         def linux_gnu_libs(ruby_ver)
           <<~SUBST
-            -l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.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:libiberty.a -l:libacl.a -l:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a \
-            -l:libzstd.a -l:libgdbm.a -l:libreadline.a -l:libtinfo.a -l:libffi.a -l:libncurses.a -l:libjemalloc.a -l:libunwind.a -l:libcrypt.a -l:libanl.a -l:liblzma.a \
-            #{PatchHelpers.yaml_reference(ruby_ver)} -l:libboost_system.a -l:libstdc++.a -l:librt.a -ldl -lpthread
+            -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:libarchive.a -l:libfmt.a -l:libdouble-conversion.a -l:libglog.a -l:libgflags.a -l:libevent.a     \
+            -l:libiberty.a -l:libacl.a -l:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a -l:libzstd.a -l:libbrotlienc.a -l:libbrotlidec.a -l:libbrotlicommon.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 #{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
-            -l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.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:libiberty.a -l:libacl.a -l:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a \
-            -l:libzstd.a -l:libgdbm.a -l:libreadline.a -l:libffi.a -l:libncurses.a -l:libjemalloc.a -l:libunwind.a -l:libcrypt.a -l:liblzma.a \
-            #{PatchHelpers.yaml_reference(ruby_ver)} -l:libboost_system.a -l:libstdc++.a -l:librt.a -ldl -lpthread
+            -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 -l:libiberty.a        \
+            -l:libacl.a -l:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a -l:libzstd.a -l:libbrotlienc.a -l:libbrotlidec.a -l:libbrotlicommon.a -l:libgdbm.a -l:libreadline.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
 
@@ -139,15 +156,14 @@ module Tebako
         end
 
         def template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver)
-          base_patch = TEMPLATE_MAKEFILE_IN_BASE_PATCH_ONE.merge(mlibs_subst(ostype, deps_lib_dir, ruby_ver))
-          base_patch.merge!(template_makefile_in_patch_two(ruby_ver))
+          template_makefile_in_patch_two(ruby_ver).merge(mlibs_subst(ostype, deps_lib_dir, ruby_ver))
         end
 
         def template_makefile_in_patch_two(ruby_ver)
           if PatchHelpers.ruby31?(ruby_ver)
-            { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_TWO => TEMPLATE_MAKEFILE_IN_BASE_PATCH_TWO }
+            { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => TEMPLATE_MAKEFILE_IN_BASE_PATCH }
           else
-            { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_TWO_PRE_3_1 => TEMPLATE_MAKEFILE_IN_BASE_PATCH_TWO_PRE_3_1 }
+            { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 => TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1 }
           end
         end
       end

data/lib/tebako/packager/patch_helpers.rb

@@ -34,13 +34,23 @@ module Tebako
     # Ruby patching helpers (pass2)
     module PatchHelpers
       class << self
-        def get_prefix(package)
+        def get_prefix_macos(package)
           out, st = Open3.capture2("brew --prefix #{package}")
           raise Tebako::Error, "brew --prefix #{package} failed with code #{st.exitstatus}" unless st.exitstatus.zero?
 
           out
         end
 
+        def get_prefix_linux(package)
+          out, st = Open3.capture2("pkg-config --variable=libdir #{package}")
+          unless st.exitstatus.zero?
+            raise Tebako::Error,
+                  "pkg-config --variable=libdir #{package} failed with code #{st.exitstatus}"
+          end
+
+          out
+        end
+
         def ruby3x?(ruby_ver)
           ruby_ver[0] == "3"
         end

data/lib/tebako/packager/patch_literals.rb

@@ -168,32 +168,24 @@ module Tebako
         ["dln.c", "static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;"]
       ].freeze
 
-      TEMPLATE_MAKEFILE_IN_BASE_PATCH_ONE = {
-        "LIBS = @LIBS@ $(EXTLIBS)" => <<~SUBST
-          # -- Start of tebako patch --
-          LIBS = $(MAINLIBS) @LIBS@
-          # -- End of tebako patch --
-        SUBST
-      }.freeze
-
-      TEMPLATE_MAKEFILE_IN_BASE_PATTERN_TWO_PRE_3_1 =
+      TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 =
         "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
         "$(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
 
-      TEMPLATE_MAKEFILE_IN_BASE_PATCH_TWO_PRE_3_1 =
+      TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1 =
         "# -- Start of tebako patch --\n" \
         "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(LIBS) $(OUTFLAG)$@\n" \
+        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
         "# -- End of tebako patch --"
 
-      TEMPLATE_MAKEFILE_IN_BASE_PATTERN_TWO =
-        "\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) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
 
-      TEMPLATE_MAKEFILE_IN_BASE_PATCH_TWO =
+      TEMPLATE_MAKEFILE_IN_BASE_PATCH =
         "# -- Start of tebako patch --\n" \
         "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(LIBS) $(OUTFLAG)$@\n" \
+        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
         "# -- End of tebako patch --"
 
       C_FILE_SUBST = <<~SUBST
@@ -259,17 +251,28 @@ module Tebako
 
       }.freeze
 
+      LINUX_PATCHES = {
+        "ext/extmk.rb" => {
+          "mf.macro \"EXTLIBS\", $extlibs" => "#  mf.macro \"EXTLIBS\", $extlibs   tebako patched"
+        }
+      }.freeze
+
       # rubocop:disable Style/WordArray
+
+      # NOTE: folly provides build-in implementation of jemalloc
+
       DARWIN_BREW_LIBS = [
-        ["openssl@1.1", "ssl"],   ["openssl@1.1", "crypto"],  ["zlib", "z"],            ["gdbm", "gdbm"],
-        ["readline", "readline"], ["libffi", "ffi"],          ["ncurses", "ncurses"],   ["fmt", "fmt"],
-        ["lz4", "lz4"],           ["xz", "lzma"],             ["libyaml", "yaml"],
+        ["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_32 = [["libyaml", "yaml"]].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_DEP_LIBS = ["glog", "gflags"].freeze
+      DARWIN_DEP_LIBS = ["glog", "gflags", "brotlienc", "brotlidec", "brotlicommon"].freeze
       # rubocop:enable Style/WordArray
     end
     # rubocop:enable Metrics/ModuleLength

data/lib/tebako/version.rb

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

data/resources/tebako-fs.cpp.in

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (c) 2021-2022 [Ribose Inc](https://www.ribose.com).
+ * Copyright (c) 2021-2023 [Ribose Inc](https://www.ribose.com).
  * All rights reserved.
  * This file is a part of tebako
  *
@@ -34,4 +34,4 @@ namespace tebako {
 	const char * fs_mount_point = "@FS_MOUNT_POINT@";
 	const char * fs_entry_point = "@FS_ENTRY_POINT@";
 	INCBIN(fs, "@DATA_BIN_FILE@");
-}
+}

data/version.txt

@@ -1 +1 @@
-0.5.4
+0.5.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor