From 9a2cfe882301e10ba9e75f74ce79303e63685c7b Mon Sep 17 00:00:00 2001
From: Robert Maynard <rmaynard@nvidia.com>
Date: Tue, 5 Sep 2023 13:35:39 -0400
Subject: [PATCH 1/2] Support fmt use in debug builds (#456)

Fixes #454

Backport of an upstream patch (https://github.com/fmtlib/fmt/pull/3352) to our version of fmt 9.1

Authors:
  - Robert Maynard (https://github.com/robertmaynard)

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: https://github.com/rapidsai/rapids-cmake/pull/456
---
 rapids-cmake/cpm/patches/fmt/no_debug_warnings.diff | 13 +++++++++++++
 rapids-cmake/cpm/versions.json                      |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 rapids-cmake/cpm/patches/fmt/no_debug_warnings.diff

diff --git a/rapids-cmake/cpm/patches/fmt/no_debug_warnings.diff b/rapids-cmake/cpm/patches/fmt/no_debug_warnings.diff
new file mode 100644
index 00000000..9c778f41
--- /dev/null
+++ b/rapids-cmake/cpm/patches/fmt/no_debug_warnings.diff
@@ -0,0 +1,13 @@
+diff --git a/include/fmt/core.h b/include/fmt/core.h
+index f6a37af..ffabe63 100644
+--- a/include/fmt/core.h
++++ b/include/fmt/core.h
+@@ -286,7 +286,7 @@
+ 
+ // Enable minimal optimizations for more compact code in debug mode.
+ FMT_GCC_PRAGMA("GCC push_options")
+-#if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER)
++#if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER) && !defined(__LCC__) && !defined(__CUDACC__)
+ FMT_GCC_PRAGMA("GCC optimize(\"Og\")")
+ #endif
+ 
diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json
index 7bfc608c..d1a7dcbc 100644
--- a/rapids-cmake/cpm/versions.json
+++ b/rapids-cmake/cpm/versions.json
@@ -15,7 +15,14 @@
     "fmt" : {
       "version" : "9.1.0",
       "git_url" : "https://github.com/fmtlib/fmt.git",
-      "git_tag" : "${version}"
+      "git_tag" : "${version}",
+      "patches" : [
+        {
+          "file" : "fmt/no_debug_warnings.diff",
+          "issue" : "No warnings during debug builds [https://github.com/fmtlib/fmt/issues/3351]",
+          "fixed_in" : "10.0"
+        }
+      ]
     },
     "GTest" : {
       "version" : "1.13.0",

From 05a37e19518a92fa9776f70ad4b5862fe6bc8830 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Fri, 8 Sep 2023 15:18:40 -0500
Subject: [PATCH 2/2] Use `conda mambabuild` not `mamba mambabuild` (#457)

With the release of conda 23.7.3, `mamba mambabuild` stopped working. With boa installed, `conda mambabuild` uses the mamba solver, so just use that instead.

See also https://github.com/rapidsai/cudf/issues/14068.

Authors:
  - Bradley Dice (https://github.com/bdice)
  - AJ Schmidt (https://github.com/ajschmidt8)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: https://github.com/rapidsai/rapids-cmake/pull/457
---
 ci/build_cpp.sh   | 2 +-
 dependencies.yaml | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
index 1daef26b..335fa54c 100755
--- a/ci/build_cpp.sh
+++ b/ci/build_cpp.sh
@@ -11,6 +11,6 @@ rapids-print-env
 
 rapids-logger "Begin cpp build"
 
-rapids-mamba-retry mambabuild conda/recipes/rapids_core_dependencies
+rapids-conda-retry mambabuild conda/recipes/rapids_core_dependencies
 
 rapids-upload-conda-to-s3 cpp
diff --git a/dependencies.yaml b/dependencies.yaml
index 9c6f20e5..fca7f1b0 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -132,7 +132,7 @@ dependencies:
         packages:
           - pip
           - pip:
-            - sphinxcontrib-moderncmakedomain
+              - sphinxcontrib-moderncmakedomain
           - sphinx
           - sphinx-copybutton
           - sphinx_rtd_theme
@@ -145,6 +145,9 @@ dependencies:
           - scikit-build>=0.13.1
           - libpng
           - zlib
+      - output_types: [conda]
+        packages:
+          - fmt==9.1.0
   style_checks:
     common:
       - output_types: [conda, requirements]