From 90662cad562fffbdeac33f3b79eac6a02eff8c2a Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 29 Mar 2022 17:46:04 -0400 Subject: [PATCH] cmake: WITH_SYSTEM_UTF8PROC defaults to OFF change the default value of WITH_SYSTEM_UTF8PROC from ON to OFF, so that centos/rhel users can build with the default cmake configuration. no other WITH_SYSTEM_* variable in ceph defaults to ON, so this is consistent with other bundled libraries like boost and rocksdb unfortunately, this also means that users that do have system packages must opt-in to using them with -DWITH_SYSTEM_UTF8PROC=ON both deb and rpm builds dependended on the previous default value, so their logic was negated to match the new default Fixes: https://tracker.ceph.com/issues/55114 Signed-off-by: Casey Bodley --- CMakeLists.txt | 2 +- ceph.spec.in | 4 ++-- debian/rules | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd6f9972f36..33631030d12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -402,7 +402,7 @@ option(WITH_RADOSGW_MOTR "CORTX-Motr backend for Rados Gateway" OFF) option(WITH_RADOSGW_SELECT_PARQUET "Support for s3 select on parquet objects" ON) option(WITH_SYSTEM_ARROW "Use system-provided arrow" OFF) -option(WITH_SYSTEM_UTF8PROC "Use system-provided utf8proc" ON) +option(WITH_SYSTEM_UTF8PROC "Use system-provided utf8proc" OFF) if(WITH_RADOSGW) find_package(EXPAT REQUIRED) diff --git a/ceph.spec.in b/ceph.spec.in index c14dd04b2a9..467f98b6b27 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -1356,8 +1356,8 @@ cmake .. \ %if 0%{with system_arrow} -DWITH_SYSTEM_ARROW:BOOL=ON \ %endif -%if 0%{without system_utf8proc} - -DWITH_SYSTEM_UTF8PROC:BOOL=OFF \ +%if 0%{with system_utf8proc} + -DWITH_SYSTEM_UTF8PROC:BOOL=ON \ %endif -DWITH_GRAFANA:BOOL=ON diff --git a/debian/rules b/debian/rules index 8904342750f..9f49deabb0e 100755 --- a/debian/rules +++ b/debian/rules @@ -25,6 +25,7 @@ ifneq ($(filter pkg.ceph.arrow,$(DEB_BUILD_PROFILES)),) extraopts += -DWITH_SYSTEM_ARROW=ON endif +extraopts += -DWITH_SYSTEM_UTF8PROC=ON extraopts += -DWITH_OCF=ON -DWITH_LTTNG=ON extraopts += -DWITH_MGR_DASHBOARD_FRONTEND=OFF extraopts += -DWITH_PYTHON3=3 -- 2.39.5