Skip to content

Commit c7c622f

Browse files
gmarzotgmarzot
authored
Merge branch 'facebook:main' into cython-bindings-oss-build
2 parents 1882ddb + ee60b26 commit c7c622f

File tree

86 files changed

+1692
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1692
-302
lines changed

‎.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ gh_facebook_buck2_shims_meta = git
66

77
[external_cell_gh_facebook_buck2_shims_meta]
88
git_origin = https://github.com/facebook/buck2-shims-meta.git
9-
commit_hash = df09226e8022572c3840179f33267099050db94f
9+
commit_hash = 0b32ea082a2e79807b4015ed1e75308404e69e23

‎CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -996,6 +996,8 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
996996
TEST memory_arena_test WINDOWS_DISABLED SOURCES ArenaTest.cpp
997997
TEST memory_reentrant_allocator_test WINDOWS_DISABLED
998998
SOURCES ReentrantAllocatorTest.cpp
999+
TEST memory_shared_from_this_ptr_test
1000+
SOURCES shared_from_this_ptr_test.cpp
9991001
TEST memory_thread_cached_arena_test WINDOWS_DISABLED
10001002
SOURCES ThreadCachedArenaTest.cpp
10011003
TEST memory_mallctl_helper_test SOURCES MallctlHelperTest.cpp

‎buck2‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,62 @@
44
"name": "buck2",
55
"platforms": {
66
"macos-aarch64": {
7-
"size": 26226254,
7+
"size": 26389565,
88
"hash": "blake3",
9-
"digest": "aa9470d7eb85a096eaf61f832c277d108b71d62c2ec70f7bf9a9d644955d8646",
9+
"digest": "a13614ed3b8569e66d05e32f03f311360f02461f3a98352da9dc419895c2c6a7",
1010
"format": "zst",
1111
"path": "buck2-aarch64-apple-darwin",
1212
"providers": [
1313
{
14-
"url": "https://github.com/facebook/buck2/releases/download/2025-01-15/buck2-aarch64-apple-darwin.zst"
14+
"url": "https://github.com/facebook/buck2/releases/download/2025-02-01/buck2-aarch64-apple-darwin.zst"
1515
}
1616
]
1717
},
1818
"linux-aarch64": {
19-
"size": 28089853,
19+
"size": 28240310,
2020
"hash": "blake3",
21-
"digest": "fb73b58584c052c0a867f6f6124f1ff5be5a6c20678f5fab613621fff96bb685",
21+
"digest": "dea4af227327e81e43682b17e80dbcd592e624b09d32f3ffe4583bddb8e568cf",
2222
"format": "zst",
2323
"path": "buck2-aarch64-unknown-linux-musl",
2424
"providers": [
2525
{
26-
"url": "https://github.com/facebook/buck2/releases/download/2025-01-15/buck2-aarch64-unknown-linux-musl.zst"
26+
"url": "https://github.com/facebook/buck2/releases/download/2025-02-01/buck2-aarch64-unknown-linux-musl.zst"
2727
}
2828
]
2929
},
3030
"macos-x86_64": {
31-
"size": 28041686,
31+
"size": 28182928,
3232
"hash": "blake3",
33-
"digest": "d5be18e818d080b110d1d3fa0f8e5f5c25d05b4588ea442822166624800165d0",
33+
"digest": "704f95aea5104bb9e7614a005b3b9c47c2144f1e489e09defb3153f7836f8dec",
3434
"format": "zst",
3535
"path": "buck2-x86_64-apple-darwin",
3636
"providers": [
3737
{
38-
"url": "https://github.com/facebook/buck2/releases/download/2025-01-15/buck2-x86_64-apple-darwin.zst"
38+
"url": "https://github.com/facebook/buck2/releases/download/2025-02-01/buck2-x86_64-apple-darwin.zst"
3939
}
4040
]
4141
},
4242
"windows-x86_64": {
43-
"size": 23726878,
43+
"size": 23852044,
4444
"hash": "blake3",
45-
"digest": "8ef066f8bf5d6ea8aef96f043d3bff06fc5fa361a296ace7090f9460a11d7ae4",
45+
"digest": "12da105534655ad469a95aec71af016ab805c240bb0941c617f41d7c18728510",
4646
"format": "zst",
4747
"path": "buck2-x86_64-pc-windows-msvc.exe",
4848
"providers": [
4949
{
50-
"url": "https://github.com/facebook/buck2/releases/download/2025-01-15/buck2-x86_64-pc-windows-msvc.exe.zst"
50+
"url": "https://github.com/facebook/buck2/releases/download/2025-02-01/buck2-x86_64-pc-windows-msvc.exe.zst"
5151
}
5252
]
5353
},
5454
"linux-x86_64": {
55-
"size": 29531222,
55+
"size": 29726870,
5656
"hash": "blake3",
57-
"digest": "4d0c942dfd09d6a58aca43342f643f91eeaa8adb58b8d5a02a97ae5911518f1b",
57+
"digest": "d3ca383717656f086dedce3603e12f6dff044638d87a051fd7929d1f1920e656",
5858
"format": "zst",
5959
"path": "buck2-x86_64-unknown-linux-musl",
6060
"providers": [
6161
{
62-
"url": "https://github.com/facebook/buck2/releases/download/2025-01-15/buck2-x86_64-unknown-linux-musl.zst"
62+
"url": "https://github.com/facebook/buck2/releases/download/2025-02-01/buck2-x86_64-unknown-linux-musl.zst"
6363
}
6464
]
6565
}

‎build/fbcode_builder/CMake/FindZstd.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SELECT_LIBRARY_CONFIGURATIONS(ZSTD)
3030

3131
include(FindPackageHandleStandardArgs)
3232
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
33-
ZSTD DEFAULT_MSG
33+
Zstd DEFAULT_MSG
3434
ZSTD_LIBRARY ZSTD_INCLUDE_DIR
3535
)
3636

‎build/fbcode_builder/manifests/fbthrift‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ xxhash
3131
# specific configuration we rely on the folly manifest to provide this
3232
# dependency to avoid duplication.
3333

34-
[dependencies.os=linux]
35-
# python doesn't build on Windows yet and this causes python3 shebangs to
36-
# expand to a non-portable path on macOS
37-
python
38-
3934
[shipit.pathmap]
4035
xplat/thrift/public_tld = .
4136
xplat/thrift = thrift

‎build/fbcode_builder/manifests/ghc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
name = ghc
33

44
[download.os=linux]
5-
url = https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-fedora27-linux.tar.xz
6-
sha256 = b6ed67049a23054a8042e65c9976d5e196e5ee4e83b29b2ee35c8a22ab1e5b73
5+
url = https://downloads.haskell.org/~ghc/9.2.8/ghc-9.2.8-x86_64-fedora27-linux.tar.xz
6+
sha256 = 845f63cd365317bb764d81025554a2527dbe315d6fa268c9859e21b911bf2d3c
77

88
[build]
99
builder = autoconf
10-
subdir = ghc-8.10.7
10+
subdir = ghc-9.2.8
1111
build_in_src_dir = true
1212
only_install = true
1313

‎build/fbcode_builder/manifests/glean‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ builder = make
3131
[make.build_args]
3232
cabal-update
3333
all
34+
glean-hiedb
3435
glass
3536
glean-clang
3637
EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS

‎folly/BUCK‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ cpp_library(
229229

230230
cpp_library(
231231
name = "config",
232-
# @fb-only: headers = ["folly-config.h"],
232+
# @fb-only[end= ]: headers = ["folly-config.h"],
233233
headers = ["//:folly-config.h"], # @oss-only
234234
labels = ["oss_dependency"], # @oss-only
235235
)

‎folly/BUILD_MODE.bzl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ _modes = extend_build_modes(
5959
c_flags = _extra_cflags,
6060
clang_flags = _extra_clang_flags,
6161
cxx_flags = _extra_cxxflags,
62-
cxx_modular_headers = True,
6362
gcc_flags = _extra_gcc_flags,
6463
)
6564

‎folly/Benchmark.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ FOLLY_GFLAGS_DEFINE_bool(benchmark, false, "Run benchmarks.");
4646

4747
FOLLY_GFLAGS_DEFINE_bool(json, false, "Output in JSON format.");
4848

49-
FOLLY_GFLAGS_DEFINE_bool(bm_estimate_time, false, "Estimate running time");
49+
FOLLY_GFLAGS_DEFINE_bool(
50+
bm_estimate_time,
51+
false,
52+
"Estimate running time by returning the geometric mean of latency values between p25 and p75.");
5053

5154
#if FOLLY_PERF_IS_SUPPORTED
5255
FOLLY_GFLAGS_DEFINE_string(

0 commit comments

Comments
 (0)