tebako 0.7.2 → 0.7.3.rc4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CMakeLists.txt +1 -1
- data/common.env +1 -1
- data/lib/tebako/version.rb +1 -1
- data/tools/ci-scripts/patch-fbthrift.sh +4 -0
- data/tools/ci-scripts/patch-folly.sh +13 -13
- data/tools/cmake-scripts/macos-environment.cmake +8 -2
- data/version.txt +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: 3f3b44e8963dcb8233b713cecb17e415a7b8197f2ec7ac2273653643a4966e8c
|
4
|
+
data.tar.gz: def76f0080fb30b67a93c601e1d87d7d4d1e77dd3690fd4393b7814072c188ab
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2ef735655d9381b8c9ea00e126b310f1467ea5073aaed4d0e7d843c3d47689249840d7cf6d94603bdbd73052ccbad2e4f4900b64277486b93504f222443b7c7c
|
7
|
+
data.tar.gz: 40b6af3a9ae43db759b1853e7bbcf1f488a388eb6f0afefeb38158d725d37d3cc8b623b72e3213e8345371eb99ad191156ac984a1cad4f7ca61e8e0b55052b53
|
data/CMakeLists.txt
CHANGED
@@ -211,7 +211,7 @@ if(DWARFS_PRELOAD)
|
|
211
211
|
list(GET LIBDWARFS_WR_VER_COMPONENTS 2 LIBDWARFS_WR_VER_PATCH)
|
212
212
|
set (LIBDWARFS_WR_VER_M ${LIBDWARFS_WR_VER_MAJOR}.${LIBDWARFS_WR_VER_MINOR}.${LIBDWARFS_WR_VER_PATCH})
|
213
213
|
else(DWARFS_PRELOAD)
|
214
|
-
def_ext_prj_g(DWARFS_WR "v0.5.
|
214
|
+
def_ext_prj_g(DWARFS_WR "v0.5.4")
|
215
215
|
endif(DWARFS_PRELOAD)
|
216
216
|
|
217
217
|
set(LIBYAML_RUBY_OPTION "")
|
data/common.env
CHANGED
data/lib/tebako/version.rb
CHANGED
@@ -56,4 +56,8 @@ if [[ "$OSTYPE" == "msys" ]]; then
|
|
56
56
|
re="ftruncate(file\.fd(), finalBufferSize),"
|
57
57
|
sbst="folly::portability::unistd::ftruncate(file.fd(), finalBufferSize), \/* tebako patched *\/"
|
58
58
|
do_patch "$1/thrift/lib/cpp2/frozen/FrozenUtil.h" "$re" "$sbst"
|
59
|
+
|
60
|
+
re="if (detail::platform_is_windows()) {"
|
61
|
+
sbst="if (false) { \/* tebako patched *\/"
|
62
|
+
do_patch "$1/thrift/compiler/source_location.cc" "$re" "$sbst"
|
59
63
|
fi
|
@@ -146,7 +146,7 @@ if [[ "$OSTYPE" == "linux-musl"* ]]; then
|
|
146
146
|
# https://github.com/facebook/folly/issues/1478
|
147
147
|
re="#elif defined(__FreeBSD__)"
|
148
148
|
sbst="#elif defined(__FreeBSD__) || defined(__musl__) \/* Tebako patched *\/"
|
149
|
-
do_patch "$1/folly/
|
149
|
+
do_patch "$1/folly/debugging/symbolizer/Elf.cpp" "$re" "$sbst"
|
150
150
|
|
151
151
|
restore_and_save "$1/CMake/FollyConfigChecks.cmake"
|
152
152
|
re="FOLLY_HAVE_IFUNC"
|
@@ -289,23 +289,23 @@ EOM
|
|
289
289
|
sbst="(\/* tebako patched *\/ folly::portability::unistd::dup2,"
|
290
290
|
"$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
|
291
291
|
|
292
|
-
# --- folly/
|
293
|
-
defined_win32_to_msc_ver "$1/folly/
|
292
|
+
# --- folly/testing/TestUtil.cpp ---
|
293
|
+
defined_win32_to_msc_ver "$1/folly/testing/TestUtil.cpp"
|
294
294
|
re="dup("
|
295
295
|
sbst="\/* tebako patched *\/ folly::portability::unistd::dup("
|
296
|
-
"$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/
|
296
|
+
"$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/testing/TestUtil.cpp"
|
297
297
|
|
298
298
|
re="dup2("
|
299
299
|
sbst="\/* tebako patched *\/ folly::portability::unistd::dup2("
|
300
|
-
"$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/
|
300
|
+
"$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/testing/TestUtil.cpp"
|
301
301
|
|
302
302
|
re="lseek("
|
303
303
|
sbst="\/* tebako patched *\/ folly::portability::unistd::lseek("
|
304
|
-
"$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/
|
304
|
+
"$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/testing/TestUtil.cpp"
|
305
305
|
|
306
306
|
re="(close("
|
307
307
|
sbst="(\/* tebako patched *\/ folly::portability::unistd::close("
|
308
|
-
"$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/
|
308
|
+
"$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/testing/TestUtil.cpp"
|
309
309
|
|
310
310
|
# --- folly/system/MemoryMapping.cpp ---
|
311
311
|
re="0 == ftruncate("
|
@@ -475,11 +475,6 @@ EOM
|
|
475
475
|
sbst="T uninit = 0; \/* tebako patched *\/"
|
476
476
|
do_patch "$1/folly/Utility.h" "$re" "$sbst"
|
477
477
|
|
478
|
-
# --- folly/experimental/io/AsyncBase.cpp ---
|
479
|
-
re="CHECK_ERR(close(pollFd_));"
|
480
|
-
sbst="CHECK_ERR(folly::portability::unistd::close(pollFd_)); \/* tebako patched *\/"
|
481
|
-
do_patch "$1/folly/experimental/io/AsyncBase.cpp" "$re" "$sbst"
|
482
|
-
|
483
478
|
# --- folly/portability/Unistd.cpp ---
|
484
479
|
re="res = lseek64(fd, offset, whence);"
|
485
480
|
sbst="res = folly::portability::unistd::lseek64(fd, offset, whence); \/* tebako patched *\/ "
|
@@ -488,8 +483,13 @@ EOM
|
|
488
483
|
re="res = lseek(fd, offset, whence);"
|
489
484
|
sbst="res = folly::portability::unistd::lseek(fd, offset, whence); \/* tebako patched *\/ "
|
490
485
|
"$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.cpp"
|
491
|
-
# ---
|
492
486
|
|
487
|
+
# --- folly/io/async/AsyncUDPSocket.cpp
|
488
|
+
re="#elif _WIN32"
|
489
|
+
sbst="#elif _MSC_VER \/* tebako patched *\/ "
|
490
|
+
do_patch "$1/folly/io/async/AsyncUDPSocket.cpp" "$re" "$sbst"
|
491
|
+
|
492
|
+
# ---
|
493
493
|
defined_msc_ver_to_win32 "$1/folly/external/farmhash/farmhash.cpp"
|
494
494
|
defined_msc_ver_to_win32 "$1/folly/detail/IPAddressSource.h"
|
495
495
|
defined_msc_ver_to_win32 "$1/folly/portability/Sockets.cpp"
|
@@ -68,8 +68,14 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
|
|
68
68
|
# Suppress superfluous randlib warnings about "*.a" having no symbols on MacOSX.
|
69
69
|
set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
|
70
70
|
set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
|
71
|
-
|
72
|
-
|
71
|
+
|
72
|
+
if (CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
|
73
|
+
set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
|
74
|
+
endif (CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
|
75
|
+
|
76
|
+
if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
|
77
|
+
set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
|
78
|
+
endif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
|
73
79
|
|
74
80
|
set(CMAKE_CXX_FLAGS "-DTARGET_OS_SIMULATOR=0 -DTARGET_OS_IPHONE=0")
|
75
81
|
|
data/version.txt
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.7.
|
1
|
+
0.7.3
|
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.7.
|
4
|
+
version: 0.7.3.rc4
|
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-07-
|
11
|
+
date: 2024-07-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|