From 7760d31a72c52c084b3978785840c428dc62f9d4 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 15 Dec 2022 10:54:43 -0500 Subject: [PATCH] rpm: combine system_utf8proc option into system_arrow libarrow-devel depends on utf8proc-devel, so we can't enable system_arrow without system_utf8proc Signed-off-by: Casey Bodley --- ceph.spec.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 4e8c45ab706..f5a6c0418d4 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -106,7 +106,6 @@ %bcond_with cephfs_shell %endif %bcond_with system_arrow -%bcond_with system_utf8proc %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 %global weak_deps 1 %endif @@ -324,8 +323,6 @@ BuildRequires: libpmemobj-devel >= 1.8 %if 0%{with system_arrow} BuildRequires: libarrow-devel BuildRequires: parquet-libs-devel -%endif -%if 0%{with system_utf8proc} BuildRequires: utf8proc-devel %endif %if 0%{with seastar} @@ -1420,8 +1417,6 @@ cmake .. \ %endif %if 0%{with system_arrow} -DWITH_SYSTEM_ARROW:BOOL=ON \ -%endif -%if 0%{with system_utf8proc} -DWITH_SYSTEM_UTF8PROC:BOOL=ON \ %endif %if 0%{with seastar} -- 2.39.5