GNU bug report logs - #77406
[PATCH sysadmin-team] gnu: spdlog: Update to 1.15.2.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 77406 in the body.
You can then email your comments to 77406 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH sysadmin-team] gnu: spdlog: Update to 1.15.2.
Date: Mon, 31 Mar 2025 15:17:58 +0000

* gnu/packages/logging.scm (spdlog): Update to 1.15.2.

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

diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index b5431566fe..7425cd2740 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -239,7 +239,7 @@ (define-public multitail
 (define-public spdlog
   (package
     (name "spdlog")
-    (version "1.15.1")
+    (version "1.15.2")
     (source
      (origin
        (method git-fetch)
@@ -248,7 +248,7 @@ (define-public spdlog
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1drpbn7b6iikypdlsvzpcjwyls0rqzl7sz7f7xjbn3d7ic55a1p1"))))
+        (base32 "0n6i8d5aycvp9n2zz2rz67s1y19cw9m5j3pk4719d3a5czh4267m"))))
     (build-system cmake-build-system)
     ;; TODO run benchmark. Currently not possible, as adding
     ;; (gnu packages benchmark) forms a dependency cycle

base-commit: 773014994fa486727df9c335c778ec678c691075
-- 
2.49.0

Message #8 received at 77406 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 77406 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH sysadmin-team v2 0/2] Update spdlog.
Date: Tue, 22 Apr 2025 19:26:22 +0000

v2 enables the building and installation of the benchmark binaries.

There are 30 dependent packages:
  guix refresh -l spdlog \
               -e '(@@ (gnu packages logging) spdlog-1.13)' \
               -e '(@@ (gnu packages logging) spdlog-1.10)'

Greg Hogan (2):
  gnu: spdlog: Update to 1.15.2.
  gnu: spdlog: Include benchmarks.

 gnu/packages/logging.scm | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)


base-commit: 77bb1c698682a76bb2ccecfc3fe63ee15da0e630
-- 
2.49.0

Message #11 received at 77406 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 77406 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH sysadmin-team v2 1/2] gnu: spdlog: Update to 1.15.2.
Date: Tue, 22 Apr 2025 19:26:23 +0000

* gnu/packages/logging.scm (spdlog): Update to 1.15.2.

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

diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index b5431566fe..7425cd2740 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -239,7 +239,7 @@ (define-public multitail
 (define-public spdlog
   (package
     (name "spdlog")
-    (version "1.15.1")
+    (version "1.15.2")
     (source
      (origin
        (method git-fetch)
@@ -248,7 +248,7 @@ (define-public spdlog
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1drpbn7b6iikypdlsvzpcjwyls0rqzl7sz7f7xjbn3d7ic55a1p1"))))
+        (base32 "0n6i8d5aycvp9n2zz2rz67s1y19cw9m5j3pk4719d3a5czh4267m"))))
     (build-system cmake-build-system)
     ;; TODO run benchmark. Currently not possible, as adding
     ;; (gnu packages benchmark) forms a dependency cycle
-- 
2.49.0

Message #14 received at 77406 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 77406 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH sysadmin-team v2 2/2] gnu: spdlog: Include benchmarks.
Date: Tue, 22 Apr 2025 19:26:24 +0000

* gnu/packages/logging.scm (spdlog)[outputs]: Add "bin".
[arguments]<#:configure-flags>: Enable benchmark builds.
<#:phases>: Add 'patch phase to insert install commands.
[inputs]: Add googlebenchmark.

Change-Id: Ia0494c1efffb13bcb5dcd470372cf5427f003857
---
 gnu/packages/logging.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index 7425cd2740..8c5e517f21 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -250,16 +250,29 @@ (define-public spdlog
        (sha256
         (base32 "0n6i8d5aycvp9n2zz2rz67s1y19cw9m5j3pk4719d3a5czh4267m"))))
     (build-system cmake-build-system)
-    ;; TODO run benchmark. Currently not possible, as adding
-    ;; (gnu packages benchmark) forms a dependency cycle
+    (outputs '("out" "bin"))
     (arguments
      (list #:configure-flags
-           #~(list "-DSPDLOG_BUILD_BENCH=OFF"
+           #~(list "-DSPDLOG_BUILD_BENCH=ON"
                    "-DSPDLOG_BUILD_SHARED=ON"
                    #$@(if (%current-target-system)
                           '()
-                          '("-DSPDLOG_BUILD_TESTS=ON")))))
+                          '("-DSPDLOG_BUILD_TESTS=ON")))
+           #:phases
+           #~(modify-phases %standard-phases
+             (add-after 'unpack 'patch
+               (lambda _
+                 (substitute* "bench/CMakeLists.txt"
+                   ;; Add install command for each benchmark program.
+                   (("add_executable\\(([^ ]+) .*$" all target)
+                    (string-append all
+                                   "install(TARGETS "
+                                   target
+                                   " DESTINATION "
+                                   #$output:bin "/bin"
+                                   ")\n"))))))))
     (native-inputs (list catch2-3))
+    (inputs (list googlebenchmark))
     (home-page "https://github.com/gabime/spdlog")
     (synopsis "Fast C++ logging library")
     (description "Spdlog is a very fast header-only/compiled C++ logging
-- 
2.49.0

Message #17 received at 77406 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 77406 <at> debbugs.gnu.org
Subject: Re: [PATCH sysadmin-team v2 0/2] Update spdlog.
Date: Wed, 23 Apr 2025 09:17:36 -0400

On Tue, Apr 22, 2025 at 3:26 PM Greg Hogan <code <at> greghogan.com> wrote:
>
> v2 enables the building and installation of the benchmark binaries.
>
> There are 30 dependent packages:
>   guix refresh -l spdlog \
>                -e '(@@ (gnu packages logging) spdlog-1.13)' \
>                -e '(@@ (gnu packages logging) spdlog-1.10)'
>
> Greg Hogan (2):
>   gnu: spdlog: Update to 1.15.2.
>   gnu: spdlog: Include benchmarks.
>
>  gnu/packages/logging.scm | 25 +++++++++++++++++++------
>  1 file changed, 19 insertions(+), 6 deletions(-)
>
>
> base-commit: 77bb1c698682a76bb2ccecfc3fe63ee15da0e630
> --
> 2.49.0

Note to self: the packages are not hidden. One can simply run
  guix refresh -l spdlog <at> 1.15 spdlog <at> 1.13 spdlog <at> 1.10

Message #22 received at 77406-done <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: André Batista <nandre <at> riseup.net>
Cc: 77964-done <at> debbugs.gnu.org, 77911-done <at> debbugs.gnu.org,
 Dylan Connell <dylmarcon <at> gmail.com>, 77406-done <at> debbugs.gnu.org
Subject: Re: bug#77911: Kodi-wayland won't compile
Date: Fri, 2 May 2025 12:50:23 -0400

On Thu, Apr 24, 2025 at 5:52 PM André Batista <nandre <at> riseup.net> wrote:
>
> Hi, this bug is due to the same issue reported by Dariqq on #77964,
> which already has a proposed fix by Greg.  After applying that patch
> series on top of 85b5c2c8f66aed05730f6c7bdeabfaadf619bb8f and
> removing 'fmt' from the list of kodi inputs, I've successfully built
> it on a x86_64 system.
>
> Cheers!

I have left "fmt" as an input to kodi since there is no longer a
conflict with "spdlog" (which has been reverted to version 1.13).
j4-dmenu-desktop depends on spdlog-1.15 which is incompatible with the
unversioned "fmt". It's no harm to duplicate a propagated input.

After rechecking that all dependent packages build (except the broken
rxcpp) I have pushed #77406 as
c53da8704b64e835d563b1b1ca64a44f0d1d9746 and #77964 as
0b83a27b67ae92e988795322ae988518ec3e6972.

Greg

Message #25 received at 77406-done <at> debbugs.gnu.org (full text, mbox):

From: André Batista <nandre <at> riseup.net>
To: Greg Hogan <code <at> greghogan.com>
Cc: 77964-done <at> debbugs.gnu.org, 77911-done <at> debbugs.gnu.org,
 Dylan Connell <dylmarcon <at> gmail.com>, 77406-done <at> debbugs.gnu.org
Subject: Re: bug#77911: Kodi-wayland won't compile
Date: Sat, 3 May 2025 12:43:54 -0300

sex 02 mai 2025 às 12:50:23 (1746201023), code <at> greghogan.com enviou:
> On Thu, Apr 24, 2025 at 5:52 PM André Batista <nandre <at> riseup.net> wrote:
> >
> > Hi, this bug is due to the same issue reported by Dariqq on #77964,
> > which already has a proposed fix by Greg.  After applying that patch
> > series on top of 85b5c2c8f66aed05730f6c7bdeabfaadf619bb8f and
> > removing 'fmt' from the list of kodi inputs, I've successfully built
> > it on a x86_64 system.
> >
> > Cheers!
> 
> I have left "fmt" as an input to kodi since there is no longer a
> conflict with "spdlog" (which has been reverted to version 1.13).
> j4-dmenu-desktop depends on spdlog-1.15 which is incompatible with the
> unversioned "fmt". It's no harm to duplicate a propagated input.
> 

Even better then.

> After rechecking that all dependent packages build (except the broken
> rxcpp) I have pushed #77406 as
> c53da8704b64e835d563b1b1ca64a44f0d1d9746 and #77964 as
> 0b83a27b67ae92e988795322ae988518ec3e6972.
> 

Thanks!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.