tebako 0.8.4 → 0.8.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CMakeLists.txt +12 -6
- data/common.env +1 -1
- data/lib/tebako/deploy_helper.rb +19 -5
- data/lib/tebako/packager/patch_main.rb +0 -1
- data/lib/tebako/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ebe002df1e8e8daadd33a026a9c6025942fbfd862a3db0c3ef1c65ffefa4b631
|
4
|
+
data.tar.gz: d814f2f7c57f01d497472afb7262f7ae635af13f16e107eaa3794dd180474309
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c2e39d4b7869385b5ef17ed3e6233ea83040f18b8b791a8ac195c3a4c94846954e4a7a1ef64e6a176fd4f4c335cd81c234446b41602e8dcd45e03fdde137cf83
|
7
|
+
data.tar.gz: e97d5ffc1d62860a623d3a342a7258f43bbfd9922cb341a26cc6ffcdeda8d5efac2aafa1e67d6e0d8e5e1d7edf6860b5a91df7d739f6e38aa192fa3bc342addc
|
data/CMakeLists.txt
CHANGED
@@ -204,7 +204,7 @@ string(CONCAT RUBY_API_VER ${RUBY_VER_BASE} ".0")
|
|
204
204
|
# list(GET LIBDWARFS_WR_VER_COMPONENTS 2 LIBDWARFS_WR_VER_PATCH)
|
205
205
|
# set (LIBDWARFS_WR_VER_M ${LIBDWARFS_WR_VER_MAJOR}.${LIBDWARFS_WR_VER_MINOR}.${LIBDWARFS_WR_VER_PATCH})
|
206
206
|
#else(DWARFS_PRELOAD)
|
207
|
-
def_ext_prj_g(DWARFS_WR "v0.5.
|
207
|
+
def_ext_prj_g(DWARFS_WR "v0.5.9")
|
208
208
|
#endif(DWARFS_PRELOAD)
|
209
209
|
|
210
210
|
set(LIBYAML_RUBY_OPTION "")
|
@@ -332,7 +332,7 @@ endif(DWARFS_PRELOAD)
|
|
332
332
|
# Ruby
|
333
333
|
|
334
334
|
set(RUBY_L_FLAGS "-L${DEPS_LIB_DIR} -L${CMAKE_CURRENT_BINARY_DIR}")
|
335
|
-
set(RUBY_C_FLAGS "-
|
335
|
+
set(RUBY_C_FLAGS "-fPIC -I${DEPS_INCLUDE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/include")
|
336
336
|
|
337
337
|
# Shadow
|
338
338
|
# https://github.com/deivid-rodriguez/byebug/issues/825
|
@@ -341,16 +341,13 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|
341
341
|
string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -fdeclspec")
|
342
342
|
endif()
|
343
343
|
|
344
|
-
set(C_FLAGS_DEST
|
344
|
+
set(C_FLAGS_DEST cflags)
|
345
345
|
|
346
346
|
if(IS_DARWIN)
|
347
347
|
string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -I${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/include -I${BREW_PREFIX}/opt/zlib/include -I${BREW_PREFIX}/include")
|
348
348
|
string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/lib -L${BREW_PREFIX}/opt/zlib/lib -L${BREW_PREFIX}/lib")
|
349
349
|
set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
|
350
|
-
set(C_FLAGS_DEST cflags)
|
351
350
|
else(IS_DARWIN)
|
352
|
-
string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -static-libgcc")
|
353
|
-
|
354
351
|
if(IS_MUSL)
|
355
352
|
string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DENABLE_PATH_CHECK=0")
|
356
353
|
endif(IS_MUSL)
|
@@ -358,7 +355,13 @@ else(IS_DARWIN)
|
|
358
355
|
if(RB_W32)
|
359
356
|
string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DRB_W32=1")
|
360
357
|
string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -l:libstdc++.a -L${TLIBD}")
|
358
|
+
set(C_FLAGS_DEST cppflags)
|
361
359
|
endif(RB_W32)
|
360
|
+
|
361
|
+
# Ruby 2.7 configure script error
|
362
|
+
if(${RUBY_VER} VERSION_LESS "3.0.0")
|
363
|
+
set(C_FLAGS_DEST cppflags)
|
364
|
+
endif()
|
362
365
|
endif(IS_DARWIN)
|
363
366
|
|
364
367
|
message(STATUS "Ruby build ${C_FLAGS_DEST}='${RUBY_C_FLAGS}'")
|
@@ -485,6 +488,9 @@ else (${SETUP_MODE})
|
|
485
488
|
${DEPS_INCLUDE_DIR}/tebako/tebako-version.h
|
486
489
|
)
|
487
490
|
|
491
|
+
#et_target_properties(tebako-fs PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
492
|
+
#target_compile_options(tebako-fs PRIVATE -fPIE)
|
493
|
+
|
488
494
|
if(${RUBY_VER} VERSION_LESS "3.3.0" AND "${OSTYPE_TXT}" MATCHES "^msys*")
|
489
495
|
target_compile_definitions(tebako-fs PUBLIC RB_W32_PRE_33)
|
490
496
|
endif(${RUBY_VER} VERSION_LESS "3.3.0" AND "${OSTYPE_TXT}" MATCHES "^msys*")
|
data/common.env
CHANGED
data/lib/tebako/deploy_helper.rb
CHANGED
@@ -100,7 +100,7 @@ module Tebako
|
|
100
100
|
end
|
101
101
|
|
102
102
|
def needs_bundler?
|
103
|
-
@gf_length.positive?
|
103
|
+
@gf_length.positive? && !@ruby_ver.ruby31?
|
104
104
|
end
|
105
105
|
|
106
106
|
def update_rubygems
|
@@ -171,14 +171,28 @@ module Tebako
|
|
171
171
|
end
|
172
172
|
|
173
173
|
def configure_commands
|
174
|
-
|
175
|
-
|
174
|
+
if @os_type =~ /msys/
|
175
|
+
configure_commands_msys
|
176
|
+
else
|
177
|
+
configure_commands_not_msys
|
178
|
+
end
|
176
179
|
|
177
180
|
@gem_command = File.join(@tbd, "gem#{@cmd_suffix}")
|
178
181
|
@bundler_command = File.join(@tbd, "bundle#{@bat_suffix}")
|
182
|
+
end
|
183
|
+
|
184
|
+
def configure_commands_msys
|
185
|
+
@cmd_suffix = ".cmd"
|
186
|
+
@bat_suffix = ".bat"
|
187
|
+
@force_ruby_platform = "true"
|
188
|
+
@nokogiri_option = "--use-system-libraries"
|
189
|
+
end
|
179
190
|
|
180
|
-
|
181
|
-
@
|
191
|
+
def configure_commands_not_msys
|
192
|
+
@cmd_suffix = ""
|
193
|
+
@bat_suffix = ""
|
194
|
+
@force_ruby_platform = "false"
|
195
|
+
@nokogiri_option = "--no-use-system-libraries"
|
182
196
|
end
|
183
197
|
|
184
198
|
def configure_scenario
|
data/lib/tebako/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tebako
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.8.
|
4
|
+
version: 0.8.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-08-
|
11
|
+
date: 2024-08-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|