Merge pull request #59 from kkraus14/fix_constexpr_nvcc

Add patch to fix nvcc
conda-forge · Oct 16, 2023 · 8464348 · 8464348
2 parents f9448de + 41546b8
commit 8464348
Show file tree

Hide file tree

Showing 11 changed files with 197 additions and 70 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 fmt:
 - '10'
 macos_machine:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 fmt:
 - '10'
 macos_machine:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -10,10 +10,11 @@ source:
   url: https://github.com/gabime/{{ name|lower }}/archive/v{{ version }}.tar.gz
   sha256: {{ sha256 }}
   patches:
-    - fix.patch
+    - patches/fix.patch
+    - patches/0001-Match-SPDLOG_CONSTEXPR_FUNC-to-FMT_CONSTEXPR-2901.patch
 
 build:
-  number: 1
+  number: 2
   run_exports:
     - {{ pin_subpackage('spdlog', max_pin='x.x') }}
 

diff --git a/recipe/patches/0001-Match-SPDLOG_CONSTEXPR_FUNC-to-FMT_CONSTEXPR-2901.patch b/recipe/patches/0001-Match-SPDLOG_CONSTEXPR_FUNC-to-FMT_CONSTEXPR-2901.patch
@@ -0,0 +1,54 @@
+From a3a499b19dfba55ae9a995de181eac7921c13bf3 Mon Sep 17 00:00:00 2001
+From: Keith Kraus <[email protected]>
+Date: Fri, 13 Oct 2023 03:00:00 -0400
+Subject: [PATCH] Match SPDLOG_CONSTEXPR_FUNC to FMT_CONSTEXPR (#2901)
+
+* Modify the condition of SPDLOG_CONSTEXPR_FUNC to match that of fmt
+---
+ include/spdlog/common.h | 29 +++++++++++++++++++----------
+ 1 file changed, 19 insertions(+), 10 deletions(-)
+
+diff --git a/include/spdlog/common.h b/include/spdlog/common.h
+index 0a262eb2..29ef2324 100644
+--- a/include/spdlog/common.h
++++ b/include/spdlog/common.h
+@@ -62,17 +62,26 @@
+
+ // visual studio up to 2013 does not support noexcept nor constexpr
+ #if defined(_MSC_VER) && (_MSC_VER < 1900)
+-#    define SPDLOG_NOEXCEPT _NOEXCEPT
+-#    define SPDLOG_CONSTEXPR
+-#    define SPDLOG_CONSTEXPR_FUNC inline
++    #define SPDLOG_NOEXCEPT _NOEXCEPT
++    #define SPDLOG_CONSTEXPR
+ #else
+-#    define SPDLOG_NOEXCEPT noexcept
+-#    define SPDLOG_CONSTEXPR constexpr
+-#    if __cplusplus >= 201402L
+-#        define SPDLOG_CONSTEXPR_FUNC constexpr
+-#    else
+-#        define SPDLOG_CONSTEXPR_FUNC inline
+-#    endif
++    #define SPDLOG_NOEXCEPT noexcept
++    #define SPDLOG_CONSTEXPR constexpr
++#endif
++
++// If building with std::format, can just use constexpr, otherwise if building with fmt
++// SPDLOG_CONSTEXPR_FUNC needs to be set the same as FMT_CONSTEXPR to avoid situations where
++// a constexpr function in spdlog could end up calling a non-constexpr function in fmt
++// depending on the compiler
++// If fmt determines it can't use constexpr, we should inline the function instead
++#ifdef SPDLOG_USE_STD_FORMAT
++    #define SPDLOG_CONSTEXPR_FUNC constexpr
++#else  // Being built with fmt
++    #if FMT_USE_CONSTEXPR
++        #define SPDLOG_CONSTEXPR_FUNC FMT_CONSTEXPR
++    #else
++	#define SPDLOG_CONSTEXPR_FUNC inline
++    #endif
+ #endif
+
+ #if defined(__GNUC__) || defined(__clang__)
+-- 
+2.42.0
+
diff --git a/recipe/fix.patch → recipe/patches/fix.patch b/recipe/fix.patch → recipe/patches/fix.patch