From 25fbdc5a319945e7fdfcea1c0ad3b4a9a7324cd5 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 7 Feb 2020 14:18:24 -0800 Subject: [PATCH] Fix Buck build on macOS (#6378) 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 --- TARGETS | 5 ++--- buckifier/targets_cfg.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/TARGETS b/TARGETS index 4aed52b23..2f298a46f 100644 --- a/TARGETS +++ b/TARGETS @@ -26,14 +26,13 @@ ROCKSDB_EXTERNAL_DEPS = [ ("lz4", None, "lz4"), ("zstd", None), ("tbb", None), - ("liburing", None, "uring"), ("googletest", None, "gtest"), ] ROCKSDB_OS_DEPS = [ ( "linux", - ["third-party//numa:numa"], + ["third-party//numa:numa", "third-party//liburing:uring"], ), ] @@ -50,6 +49,7 @@ ROCKSDB_OS_PREPROCESSOR_FLAGS = [ "-DROCKSDB_IOURING_PRESENT", "-DHAVE_SSE42", "-DNUMA", + "-DLIBURING", ], ), ( @@ -72,7 +72,6 @@ ROCKSDB_PREPROCESSOR_FLAGS = [ "-DZSTD_STATIC_LINKING_ONLY", "-DGFLAGS=gflags", "-DTBB", - "-DLIBURING", # Added missing flags from output of build_detect_platform "-DROCKSDB_BACKTRACE", diff --git a/buckifier/targets_cfg.py b/buckifier/targets_cfg.py index 81d3babfd..ce45cc03a 100644 --- a/buckifier/targets_cfg.py +++ b/buckifier/targets_cfg.py @@ -32,14 +32,13 @@ ROCKSDB_EXTERNAL_DEPS = [ ("lz4", None, "lz4"), ("zstd", None), ("tbb", None), - ("liburing", None, "uring"), ("googletest", None, "gtest"), ] ROCKSDB_OS_DEPS = [ ( "linux", - ["third-party//numa:numa"], + ["third-party//numa:numa", "third-party//liburing:uring"], ), ] @@ -56,6 +55,7 @@ ROCKSDB_OS_PREPROCESSOR_FLAGS = [ "-DROCKSDB_IOURING_PRESENT", "-DHAVE_SSE42", "-DNUMA", + "-DLIBURING", ], ), ( @@ -78,7 +78,6 @@ ROCKSDB_PREPROCESSOR_FLAGS = [ "-DZSTD_STATIC_LINKING_ONLY", "-DGFLAGS=gflags", "-DTBB", - "-DLIBURING", # Added missing flags from output of build_detect_platform "-DROCKSDB_BACKTRACE",