[PATCH 0/2] gnu: tomlc99: Update to 1.0-1.5221b3d.

  • Done
  • quality assurance status badge
Details
2 participants
  • Jean-Pierre De Jesus DIAZ
  • Christopher Baines
Owner
unassigned
Submitted by
Jean-Pierre De Jesus DIAZ
Severity
normal
J
J
Jean-Pierre De Jesus DIAZ wrote on 3 Apr 13:19 +0200
(address . guix-patches@gnu.org)(name . Jean-Pierre De Jesus DIAZ)(address . jean@foundation.xyz)
cover.1712142989.git.jean@foundation.xyz
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
J
J
Jean-Pierre De Jesus DIAZ wrote on 3 Apr 13:21 +0200
[PATCH 2/2] gnu: tomlc99: Install pkg-config file.
(address . 70161@debbugs.gnu.org)(name . Jean-Pierre De Jesus DIAZ)(address . jean@foundation.xyz)
642f39b405faa550087b7ffed9a303bbd7ab089a.1712142989.git.jean@foundation.xyz
* 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(-)

Toggle diff (46 lines)
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
J
J
Jean-Pierre De Jesus DIAZ wrote on 3 Apr 13:21 +0200
[PATCH 1/2] gnu: tomlc99: Update to 1.0-1.5221b3d.
(address . 70161@debbugs.gnu.org)(name . Jean-Pierre De Jesus DIAZ)(address . jean@foundation.xyz)
46684bbf883bb6209e94ab6b0e87b0240d3cf32f.1712142989.git.jean@foundation.xyz
* 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(-)

Toggle diff (35 lines)
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@disroot.org>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2023 zamfofex <zamfofex@twdb.moe>
-;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
+;;; Copyright © 2023, 2024 Foundation Devices, Inc. <hello@foundation.xyz>
;;; Copyright © 2023, 2024 David Elsing <david.elsing@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
C
C
Christopher Baines wrote on 30 Apr 22:04 +0200
Re: [bug#70161] [PATCH 0/2] gnu: tomlc99: Update to 1.0-1.5221b3d.
(name . Jean-Pierre De Jesus DIAZ)(address . jean@foundation.xyz)(address . 70161-done@debbugs.gnu.org)
87edamy5vq.fsf@cbaines.net
Jean-Pierre De Jesus DIAZ <jean@foundation.xyz> writes:

Toggle quote (15 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYxTrlfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xf65A//ZvGXPT2DpuPIU4etLt4/wq+OmZzPCo76
Yl7QRZhqAWWw4v5qMGxHcCId8+6IvJHgvoYSDXpdTyI0TyJSVvvt5UiMOowbyaF1
MY87FuGAqCX7DsoTBZAV1/NkcHZ2RTFP8LLgg8bukKUKTl9A9DndljgxVx+fQqrj
q85YJeD1oaNEJyXVkmtRr7eXRo8D/T4LBLRpKDWF5vcLqdRkAg0rAGzLn5f5zKCL
ycmKspwlWNwD1McBK9pIjbNihxezvtXj7POacZ2OmcWaxlCtQ6TymkgslIdgjLbv
xgch7oDvTTZaWU/snQyhPReKzWO/6GHTxU+FTtWfZq42WKbS1PsbpmzAm3mKX02l
skAbWm12orJed4wxv0l6o86MchIcI5vsCNbnYnN4boEymwqmNsbo2gI+jOugIAtq
b5z2BHTEkkxqgeiD6zOtrRjjjMzb7vXdX5YuPseQvWGIm8EedGoGf4KRg8eHF1yb
Tg3FOWC7YglZA6Dal5vqNAVLSyziev3m81c7Zz/VRiwXdJSvkuB1kNNHNEnxRM0y
esp9nreGIpjEFMhFbpqsphNrkgXk2ae9pq9Gh5R9suRhFxCZjhC2mMAogthOrOiJ
6dJmnpj7zDBCYpWXoruKkKR0+3Q+BxaYGbXTshzZTE8oFyoFXW5vA6gOzIAenOVw
loHMv5Hc0Go=
=JUY/
-----END PGP SIGNATURE-----

Closed
?