[bug#69505] [PATCH 0/2] gnu: spdlog: Fix cross-compilation.

[bug#69505] [PATCH 0/2] gnu: spdlog: Fix cross-compilation.

[Zheng Junjie]

gnu: spdlog: Fix cross-compilation.

Zheng Junjie (2):
  gnu: spdlog: Use Gexps.
  gnu: spdlog: Fix cross-compilation.

 gnu/packages/logging.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


base-commit: aeaa390b71a15335bef03f83bd9dc946fa535398
prerequisite-patch-id: 3aeff34344672622675ada6d6cbfb542ade2b07c
-- 
2.41.0

[bug#69505] [PATCH 1/2] gnu: spdlog: Use Gexps.

[Zheng Junjie]

* gnu/packages/logging.scm (spdlog)[arguments]: Use Gexps.

Change-Id: I53485d8adb450f7d0bfc2a2ed8ddee51142fd9a8
---
 gnu/packages/logging.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index 47e8cd39c2..afd602db42 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -26,6 +26,7 @@
 
 (define-module (gnu packages logging)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (guix download)
@@ -227,10 +228,10 @@ (define-public spdlog
     ;; TODO run benchmark. Currently not possible, as adding
     ;; (gnu packages benchmark) forms a dependency cycle
     (arguments
-     '(#:configure-flags
-       (list "-DSPDLOG_BUILD_BENCH=OFF"
-             "-DSPDLOG_BUILD_SHARED=ON"
-             "-DSPDLOG_BUILD_TESTS=ON")))
+     (list #:configure-flags
+           #~(list "-DSPDLOG_BUILD_BENCH=OFF"
+                   "-DSPDLOG_BUILD_SHARED=ON"
+                   "-DSPDLOG_BUILD_TESTS=ON")))
     (native-inputs (list catch2-3))
     (home-page "https://github.com/gabime/spdlog")
     (synopsis "Fast C++ logging library")
-- 
2.41.0

[bug#69505] [PATCH 2/2] gnu: spdlog: Fix cross-compilation.

[Zheng Junjie via Guix-patches]

* gnu/packages/logging.scm (spdlog)[arguments]<#:configure-flags>: when
cross-compilation, don't add -DSPDLOG_BUILD_TESTS=ON.

Change-Id: I90911c548c3f138ff40bff4b086f6102b717acf2
---
 gnu/packages/logging.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index afd602db42..a757c22154 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -231,7 +231,9 @@ (define-public spdlog
      (list #:configure-flags
            #~(list "-DSPDLOG_BUILD_BENCH=OFF"
                    "-DSPDLOG_BUILD_SHARED=ON"
-                   "-DSPDLOG_BUILD_TESTS=ON")))
+                   #$@(if (%current-target-system)
+                          '()
+                          '("-DSPDLOG_BUILD_TESTS=ON")))))
     (native-inputs (list catch2-3))
     (home-page "https://github.com/gabime/spdlog")
     (synopsis "Fast C++ logging library")
-- 
2.41.0

bug#69505: [PATCH 0/2] gnu: spdlog: Fix cross-compilation.

[宋文武 via Guix-patches via]

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> gnu: spdlog: Fix cross-compilation.
>
> Zheng Junjie (2):
>   gnu: spdlog: Use Gexps.
>   gnu: spdlog: Fix cross-compilation.
>
>  gnu/packages/logging.scm | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
>
> base-commit: aeaa390b71a15335bef03f83bd9dc946fa535398
> prerequisite-patch-id: 3aeff34344672622675ada6d6cbfb542ade2b07c

Pushed now, thank you!