GNU bug report logs - #70161
[PATCH 0/2] gnu: tomlc99: Update to 1.0-1.5221b3d.

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 70161 in the body.
You can then email your comments to 70161 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: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
To: guix-patches <at> gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
Subject: [PATCH 0/2] gnu: tomlc99: Update to 1.0-1.5221b3d.
Date: Wed,  3 Apr 2024 13:19:06 +0200

This updates the tomlc99 library to 1.0-1.5221b3d.

I've reviewed the last 2 commits since the last packaged version and it
seems only to fix the toml_json binary which are not installed and to
format the files with clang-format.

It install the pkg-config files too.

Jean-Pierre De Jesus DIAZ (2):
  gnu: tomlc99: Update to 1.0-1.5221b3d.
  gnu: tomlc99: Install pkg-config file.

 gnu/packages/c.scm | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)


base-commit: 1dbe492b993a7629df3b35146ce0272b52913776
-- 
2.41.0

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

From: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
To: 70161 <at> debbugs.gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
Subject: [PATCH 2/2] gnu: tomlc99: Install pkg-config file.
Date: Wed,  3 Apr 2024 13:21:46 +0200

* gnu/packages/c.scm (tomlc99) <arguments>: Add phase to install
pkg-config file.

Change-Id: Id09f22912fe7e4dcac6a0377e4a78d3d34346106
---
 gnu/packages/c.scm | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 6e98c34af6..1b168d2ca8 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -265,16 +265,29 @@ (define-public tomlc99
                                                  #$(cc-for-target))
                                   (string-append "prefix="
                                                  #$output))
-             #:phases #~(modify-phases %standard-phases
-                          (delete 'configure)
-                          (replace 'check
-                            (lambda* (#:key tests? make-flags
-                                      #:allow-other-keys)
-                              (when tests?
-                                (apply invoke
-                                       `("make" "-C" "unittest"
-                                         ,@make-flags))
-                                (invoke "./unittest/t1")))))))
+             #:phases
+             #~(modify-phases %standard-phases
+                 (delete 'configure)
+                 (replace 'check
+                   (lambda* (#:key tests? make-flags
+                             #:allow-other-keys)
+                     (when tests?
+                       (apply invoke
+                              `("make" "-C" "unittest"
+                                ,@make-flags))
+                       (invoke "./unittest/t1"))))
+                 ;; The Makefile checks for libtoml.pc and only installs if
+                 ;; the prefix is /usr/local.
+                 (add-after 'install 'install-pkg-config
+                   (lambda _
+                     (rename-file "libtoml.pc.sample" "libtoml.pc")
+                     (substitute* "libtoml.pc"
+                       (("^prefix=.*")
+                        (string-append "prefix=" #$output "\n")))
+
+                     (let ((pc (string-append #$output "/lib/pkgconfig")))
+                       (mkdir-p pc)
+                       (install-file "libtoml.pc" pc)))))))
       (home-page "https://github.com/cktan/tomlc99")
       (synopsis "TOML library for C")
       (description
-- 
2.41.0

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

From: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
To: 70161 <at> debbugs.gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
Subject: [PATCH 1/2] gnu: tomlc99: Update to 1.0-1.5221b3d.
Date: Wed,  3 Apr 2024 13:21:45 +0200

* gnu/packages/c.scm (tomlc99): Update to 1.0-1.5221b3d.

Change-Id: Icb9c736fb7d49a097fe6db6451031637b7a01492
---
 gnu/packages/c.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index c004aade73..6e98c34af6 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -19,7 +19,7 @@
 ;;; Copyright © 2022 ( <paren <at> disroot.org>
 ;;; Copyright © 2022 Antero Mejr <antero <at> mailbox.org>
 ;;; Copyright © 2023 zamfofex <zamfofex <at> twdb.moe>
-;;; Copyright © 2023 Foundation Devices, Inc. <hello <at> foundationdevices.com>
+;;; Copyright © 2023, 2024 Foundation Devices, Inc. <hello <at> foundation.xyz>
 ;;; Copyright © 2023, 2024 David Elsing <david.elsing <at> posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -245,8 +245,8 @@ (define-public tcc
       (license license:lgpl2.1+))))
 
 (define-public tomlc99
-  (let ((revision "0")
-        (commit "52e9c039c5418a100605c2db1282590511fa891b"))
+  (let ((revision "1")
+        (commit "5221b3d3d66c25a1dc6f0372b4f824f1202fe398"))
     (package
       (name "tomlc99")
       (version (git-version "1.0" revision commit))
@@ -258,7 +258,7 @@ (define-public tomlc99
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1zrn5mmd1ysxma96jzrq50xqypbs3rhk6dwlj1wcjpjz1a4h9wgg"))))
+                  "1r443cpwy7f1f8imyfykpggkihrvv9fvdlgl95liiqmzqz9snqnd"))))
       (build-system gnu-build-system)
       (arguments
        (list #:make-flags #~(list (string-append "CC="
-- 
2.41.0

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

From: Christopher Baines <mail <at> cbaines.net>
To: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
Cc: 70161-done <at> debbugs.gnu.org
Subject: Re: [bug#70161] [PATCH 0/2] gnu: tomlc99: Update to 1.0-1.5221b3d.
Date: Tue, 30 Apr 2024 21:04:09 +0100

[Message part 1 (text/plain, inline)]

Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz> writes:

> This updates the tomlc99 library to 1.0-1.5221b3d.
>
> I've reviewed the last 2 commits since the last packaged version and it
> seems only to fix the toml_json binary which are not installed and to
> format the files with clang-format.
>
> It install the pkg-config files too.
>
> Jean-Pierre De Jesus DIAZ (2):
>   gnu: tomlc99: Update to 1.0-1.5221b3d.
>   gnu: tomlc99: Install pkg-config file.
>
>  gnu/packages/c.scm | 41 +++++++++++++++++++++++++++--------------
>  1 file changed, 27 insertions(+), 14 deletions(-)

Thanks for the patches, I've pushed these to master as
91647ba87b065dd054f3b38a4aea2de33f2e12a7.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

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