tebako 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3acd4d518e560abf4901a25e53452f910db850469375deb7e13b5ebc7c8173c4
-  data.tar.gz: 260a96de335ba92231b01543f4a19ef41a59156ae8ea8546ac7b277bb8b3d7de
+  metadata.gz: 7f8ba6c5001a0f85b9ce548a1eb6c6a1d2bfc91315996b67f5b6073464912ead
+  data.tar.gz: 5b254551b21adeb112681cc7c67bf260d7b0659e95a14d1b31b2d9c75a89d24a
 SHA512:
-  metadata.gz: 3899ed838eb003e918e9adc91efeeb1eae7d6248bff9e664ace699c1042503b19dce0179cffacaf9c7e7d7418691f0142d9a30388059e82fdb5a07b9a6a395cc
-  data.tar.gz: 499099ca4dfc86e43f8de369b590e052a46156f2bcbce28081562687dbc42fa3de044e944163df36955f639ab82655921beba41e5e8d29e884e1e2fcb69e874f
+  metadata.gz: 937ea025ebed046f071e216a26f735b92fd65a2af19b16544f6b720493e86c314bf7fb04a4fb13a8d2b16c60a75ff5831f2cb62571829164e8d943a9be969f33
+  data.tar.gz: 7f164193fcdae2f6a425867ae37587d4f74a5461075867f7eca1a0f34cc3e55b9c7c6959c4ae14637ef59077885c5840db57f40eba415605495786c2cf85d350

data/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -361,8 +361,10 @@ ExternalProject_Add(${RUBY_PRJ}
   DOWNLOAD_NO_PROGRESS true
   SOURCE_DIR ${RUBY_SOURCE_DIR}
   BUILD_IN_SOURCE true
-  PATCH_COMMAND ruby ${EXE}/tebako-packager pass1 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${FS_MOUNT_POINT} ${DATA_SRC_DIR} ${RUBY_VER}
-  CONFIGURE_COMMAND ${GNU_BASH} -c "${RUBY_SOURCE_DIR}/configure  ${OPENSSL_RUBY_OPTION} ${LIBYAML_RUBY_OPTION} \
+  CONFIGURE_COMMAND ruby ${EXE}/tebako-packager pass1 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${FS_MOUNT_POINT} ${DATA_SRC_DIR} ${RUBY_VER}
+  # Make it for MacOS otherwise LDFLAGS are invalid
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_LIB_DIR}
+  COMMAND ${GNU_BASH} -c "${RUBY_SOURCE_DIR}/configure  ${OPENSSL_RUBY_OPTION} ${LIBYAML_RUBY_OPTION} \
                                                         --without-gmp                         \
                                                         --disable-dtrace                      \
                                                         --disable-debug-env                   \
@@ -379,23 +381,27 @@ ExternalProject_Add(${RUBY_PRJ}
   COMMAND          ${GNU_BASH} -c "ruby ${EXE}/tebako-packager pass2 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${DEPS_LIB_DIR} ${DATA_SRC_DIR} ${RUBY_STASH_DIR} ${RUBY_VER}"
 )
 
-add_dependencies(${RUBY_PRJ} ${DWARFS_WR_PRJ} ${LIBDWARFS_WR_PRJ})
-
-if(IS_GNU)
-  add_dependencies(${RUBY_PRJ} ${PATCHELF_PRJ})
-endif(IS_GNU)
-
+# add_dependencies(${RUBY_PRJ} ${DWARFS_WR_PRJ})
 
 if (${SETUP_MODE})
   add_custom_target(setup
     ${CMAKE_COMMAND} -E echo "Tebako setup has completed"
     DEPENDS ${DWARFS_WR_PRJ} ${RUBY_PRJ}
   )
-else (${SETUP_MODE})
+  if(IS_GNU)
+    add_dependencies(setup ${PATCHELF_PRJ})
+  endif(IS_GNU)
+
+  else (${SETUP_MODE})
   add_custom_target(setup
     ${CMAKE_COMMAND} -E echo "Tebako setup has been verified"
     DEPENDS ${DWARFS_WR_PRJ} ${RUBY_PRJ}
   )
+  if(IS_GNU)
+    add_dependencies(setup ${PATCHELF_PRJ})
+  endif(IS_GNU)
+
+
 
   set(CMAKE_CXX_STANDARD      20)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -406,7 +412,7 @@ else (${SETUP_MODE})
 
   add_custom_target(packaged_filesystem
     COMMAND ruby ${DEPS_BIN_DIR}/deploy.rb
-    DEPENDS ${RUBY_PRJ}
+    DEPENDS setup
     BYPRODUCTS ${DATA_BIN_FILE}
   )
 

data/lib/tebako/options_manager.rb

@@ -121,6 +121,10 @@ module Tebako
       @deps_bin_dir ||= File.join(deps, "bin")
     end
 
+    def deps_lib_dir
+      @deps_lib_dir ||= File.join(deps, "lib")
+    end
+
     def fs_current
       fs_current = Dir.pwd
       if RUBY_PLATFORM =~ /msys|mingw|cygwin/

data/lib/tebako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-15 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor