From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 10 Mar 2023 21:24:59 +0000 (-0500)
Subject: fmt: remove FMT_HEADER_ONLY defines
X-Git-Tag: v18.1.0~119^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f5c934154bc456cc080839b35762c56a5313fddd;p=ceph-ci.git

fmt: remove FMT_HEADER_ONLY defines

a WITH_FMT_HEADER_ONLY cmake option controls which version of the
library to use. individual sources/targets shouldn't override that, or
they'll end up including/linking against both versions

Fixes: https://tracker.ceph.com/issues/58953

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit d4ae3d0db857766ba38656d2c5c523883e518879)
---

diff --git a/src/cls/fifo/cls_fifo.cc b/src/cls/fifo/cls_fifo.cc
index 3cbb4636c9d..85022eeb061 100644
--- a/src/cls/fifo/cls_fifo.cc
+++ b/src/cls/fifo/cls_fifo.cc
@@ -12,8 +12,6 @@
 #include <optional>
 #include <string>
 
-#undef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY 1
 #include <fmt/format.h>
 
 #include "include/buffer.h"
diff --git a/src/cls/fifo/cls_fifo_types.h b/src/cls/fifo/cls_fifo_types.h
index 2b9fec26af9..1c69c1f0871 100644
--- a/src/cls/fifo/cls_fifo_types.h
+++ b/src/cls/fifo/cls_fifo_types.h
@@ -25,8 +25,6 @@
 
 #include <boost/container/flat_set.hpp>
 
-#undef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY 1
 #include <fmt/format.h>
 #if FMT_VERSION >= 90000
 #include <fmt/ostream.h>
diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h
index c65526c06c5..37a06defc31 100644
--- a/src/cls/rgw/cls_rgw_types.h
+++ b/src/cls/rgw/cls_rgw_types.h
@@ -9,8 +9,6 @@
 #include "common/ceph_time.h"
 #include "common/Formatter.h"
 
-#undef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY 1
 #include <fmt/format.h>
 
 #include "rgw/rgw_basic_types.h"
diff --git a/src/librbd/migration/S3Stream.cc b/src/librbd/migration/S3Stream.cc
index 3b4db0cefe1..a611e274ae1 100644
--- a/src/librbd/migration/S3Stream.cc
+++ b/src/librbd/migration/S3Stream.cc
@@ -17,8 +17,6 @@
 #include "librbd/migration/HttpProcessorInterface.h"
 #include <boost/beast/http.hpp>
 
-#undef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY 1
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 
diff --git a/src/mds/cephfs_features.cc b/src/mds/cephfs_features.cc
index 6102a9b1652..0df6123e937 100644
--- a/src/mds/cephfs_features.cc
+++ b/src/mds/cephfs_features.cc
@@ -5,8 +5,6 @@
 #include "cephfs_features.h"
 #include "mdstypes.h"
 
-#undef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY 1
 #include <fmt/format.h>
 
 static const std::array feature_names
diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index 34a34628185..69bfac23778 100644
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -231,8 +231,6 @@ endif(WITH_RADOSGW_ARROW_FLIGHT)
 
 
 add_library(rgw_common STATIC ${librgw_common_srcs})
-target_compile_definitions(rgw_common
-  PUBLIC "FMT_HEADER_ONLY")
 
 include(CheckCXXCompilerFlag)
 check_cxx_compiler_flag("-Wimplicit-const-int-float-conversion"
diff --git a/src/rgw/rgw_iam_policy.h b/src/rgw/rgw_iam_policy.h
index ff6061c7550..c0a7e51b5fd 100644
--- a/src/rgw/rgw_iam_policy.h
+++ b/src/rgw/rgw_iam_policy.h
@@ -17,8 +17,6 @@
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/variant.hpp>
 
-#undef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY 1
 #include <fmt/format.h>
 
 #include "common/ceph_time.h"
diff --git a/src/test/fio/fio_librgw.cc b/src/test/fio/fio_librgw.cc
index b088b68f96c..bac4ff2daac 100644
--- a/src/test/fio/fio_librgw.cc
+++ b/src/test/fio/fio_librgw.cc
@@ -21,8 +21,6 @@
 
 #include <semaphore.h> // XXX kill this?
 
-#undef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY 1
 #include "fmt/include/fmt/format.h"
 
 #include "include/rados/librgw.h"
diff --git a/src/test/rgw/rgw_cr_test.cc b/src/test/rgw/rgw_cr_test.cc
index b53d0655923..dc5d25d23ae 100644
--- a/src/test/rgw/rgw_cr_test.cc
+++ b/src/test/rgw/rgw_cr_test.cc
@@ -6,8 +6,6 @@
 #include <sstream>
 #include <string>
 
-#undef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY 1
 #include <fmt/format.h>
 
 #include "include/rados/librados.hpp"
diff --git a/src/test/rgw/test_log_backing.cc b/src/test/rgw/test_log_backing.cc
index 4c81b2d57d2..e4109d535d1 100644
--- a/src/test/rgw/test_log_backing.cc
+++ b/src/test/rgw/test_log_backing.cc
@@ -18,8 +18,6 @@
 #include <iostream>
 #include <string_view>
 
-#undef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY 1
 #include <fmt/format.h>
 
 #include "include/types.h"