mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 21:46:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: telepathy-glib: Fix build with gcc-14.

Browse source 
* gnu/packages/glib.scm (telepathy-glib)[arguments]: Use G-Expressions.
Add CFLAGS to #:configure-flags to relax gcc-14's strictness.

Change-Id: I489e04eb8a6d1a29753f8c5fc61429f6292ae8cf
This commit is contained in:
Janneke Nieuwenhuizen 2025-01-04 16:25:19 +01:00
parent 1a93a01a54
commit 4af85bae2b
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
gnu/packages/glib.scm
View file

@ -14,7 +14,7 @@
;;; Copyright © 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2023, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Arthur Margerit <ruhtra.mar@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
@ -1156,7 +1156,7 @@ (define telepathy-glib
(version "0.24.2")
(source
(origin
(method url-fetch)
(method url-fetch)
(uri
(string-append
"https://telepathy.freedesktop.org/releases/telepathy-glib/"
@ -1166,33 +1166,36 @@ (define telepathy-glib
"1w3kja8j3gz2apal79bi3hq44xk5g78aphrqbw983l6df7bp98xh"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--enable-vala-bindings")
(list
#:configure-flags
#~(list
"CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
"--enable-vala-bindings")
;; '../tools/glib-*.py' generate files but the target dependencies are
;; (presumably) not fully specified in the makefile, leading to
;; parallel build errors like:
;;
;; EOFError: EOF read where object expected
;; make[2]: *** [Makefile:1906: _gen/register-dbus-glib-marshallers-body.h] Error 1
#:parallel-build? #f
;; When spawned in parallel, the dbus daemons may fail to shut down
;; cleanly. This issue appears to have been closed upstream due to low
;; information, but still continues to haunt folks. See also
;; <https://gitlab.freedesktop.org/telepathy/telepathy-glib/-/issues/134>.
#:parallel-tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda _
;; None of the tests below are able to find the org.gtk.vfs.Daemon
;; service file provided by gvfs.
(substitute* "tests/dbus/Makefile.in"
(("test-contacts\\$\\(EXEEXT\\)") "")
(("test-file-transfer-channel\\$\\(EXEEXT\\)") "")
(("test-stream-tube\\$\\(EXEEXT\\)") ""))
#t)))))
;; '../tools/glib-*.py' generate files but the target dependencies are
;; (presumably) not fully specified in the makefile, leading to
;; parallel build errors like:
;;
;; EOFError: EOF read where object expected
;; make[2]: *** [Makefile:1906: _gen/register-dbus-glib-marshallers-body.h] Error 1
#:parallel-build? #f
;; When spawned in parallel, the dbus daemons may fail to shut down
;; cleanly. This issue appears to have been closed upstream due to low
;; information, but still continues to haunt folks. See also
;; <https://gitlab.freedesktop.org/telepathy/telepathy-glib/-/issues/134>.
#:parallel-tests? #f
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda _
;; None of the tests below are able to find the org.gtk.vfs.Daemon
;; service file provided by gvfs.
(substitute* "tests/dbus/Makefile.in"
(("test-contacts\\$\\(EXEEXT\\)") "")
(("test-file-transfer-channel\\$\\(EXEEXT\\)") "")
(("test-stream-tube\\$\\(EXEEXT\\)") "")))))))
(native-inputs
`(("glib" ,glib "bin") ; uses glib-mkenums
`(("glib" ,glib "bin") ; uses glib-mkenums
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)
("python" ,python-2)