andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Buck build on macOS (#6378)

Browse Source 
Summary:
liburing is a Linux-specific dependency, so make sure it's configured in the Linux-only Buck rules.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6378

Test Plan:
```
~/fbcode $ cp internal_repo_rocksdb/repo/TARGETS rocksdb/src
~/fbcode $ buck build mode/mac eden
```

Reviewed By: chadaustin

Differential Revision: D19760039

Pulled By: riversand963

fbshipit-source-id: 2abfce81c8b17965ef76012262cd117708e0294f
This commit is contained in:
Chad Austin 2020-02-07 14:18:24 -08:00 committed by Facebook Github Bot
parent 752c87af78
commit 25fbdc5a31
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TARGETS
View File

@ -26,14 +26,13 @@ ROCKSDB_EXTERNAL_DEPS = [
("lz4", None, "lz4"), ("lz4", None, "lz4"),
("zstd", None), ("zstd", None),
("tbb", None), ("tbb", None),
("liburing", None, "uring"),
("googletest", None, "gtest"), ("googletest", None, "gtest"),
] ]
ROCKSDB_OS_DEPS = [ ROCKSDB_OS_DEPS = [
( (
"linux", "linux",
["third-party//numa:numa"], ["third-party//numa:numa", "third-party//liburing:uring"],
), ),
] ]
@ -50,6 +49,7 @@ ROCKSDB_OS_PREPROCESSOR_FLAGS = [
"-DROCKSDB_IOURING_PRESENT", "-DROCKSDB_IOURING_PRESENT",
"-DHAVE_SSE42", "-DHAVE_SSE42",
"-DNUMA", "-DNUMA",
"-DLIBURING",
], ],
), ),
( (
@ -72,7 +72,6 @@ ROCKSDB_PREPROCESSOR_FLAGS = [
"-DZSTD_STATIC_LINKING_ONLY", "-DZSTD_STATIC_LINKING_ONLY",
"-DGFLAGS=gflags", "-DGFLAGS=gflags",
"-DTBB", "-DTBB",
"-DLIBURING",
# Added missing flags from output of build_detect_platform # Added missing flags from output of build_detect_platform
"-DROCKSDB_BACKTRACE", "-DROCKSDB_BACKTRACE",

5
buckifier/targets_cfg.py
View File

@ -32,14 +32,13 @@ ROCKSDB_EXTERNAL_DEPS = [
("lz4", None, "lz4"), ("lz4", None, "lz4"),
("zstd", None), ("zstd", None),
("tbb", None), ("tbb", None),
("liburing", None, "uring"),
("googletest", None, "gtest"), ("googletest", None, "gtest"),
] ]
ROCKSDB_OS_DEPS = [ ROCKSDB_OS_DEPS = [
( (
"linux", "linux",
["third-party//numa:numa"], ["third-party//numa:numa", "third-party//liburing:uring"],
), ),
] ]
@ -56,6 +55,7 @@ ROCKSDB_OS_PREPROCESSOR_FLAGS = [
"-DROCKSDB_IOURING_PRESENT", "-DROCKSDB_IOURING_PRESENT",
"-DHAVE_SSE42", "-DHAVE_SSE42",
"-DNUMA", "-DNUMA",
"-DLIBURING",
], ],
), ),
( (
@ -78,7 +78,6 @@ ROCKSDB_PREPROCESSOR_FLAGS = [
"-DZSTD_STATIC_LINKING_ONLY", "-DZSTD_STATIC_LINKING_ONLY",
"-DGFLAGS=gflags", "-DGFLAGS=gflags",
"-DTBB", "-DTBB",
"-DLIBURING",
# Added missing flags from output of build_detect_platform # Added missing flags from output of build_detect_platform
"-DROCKSDB_BACKTRACE", "-DROCKSDB_BACKTRACE",