me/guix
Archived
1
0
Fork 0
Code Activity

gnu: aseba: Build sequentially and appease Valgrind.

Browse source 
* gnu/packages/robotics.scm (aseba)[source]: Remove trailing #t from
'snippet'.
[arguments]: Add #:parallel-build? and #:phases.
[native-inputs]: Add glibc:debug.
This commit is contained in:
Ludovic Courtès 2022-01-28 22:55:51 +01:00
parent 10d1125f71
commit f4554d28d6
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/robotics.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018, 2022 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -23,6 +23,7 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (gnu packages avahi) #:use-module (gnu packages avahi)
#:use-module (gnu packages base)
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
@ -91,17 +92,27 @@ hundred times faster than real-time.")
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Add missing Qt5::Network. ;; Add missing Qt5::Network.
'(begin '(substitute* "targets/playground/CMakeLists.txt"
(substitute* "targets/playground/CMakeLists.txt" (("target_link_libraries(.*)\\$\\{EXTRA_LIBS\\}" _ middle)
(("target_link_libraries(.*)\\$\\{EXTRA_LIBS\\}" _ middle) (string-append "target_link_libraries" middle
(string-append "target_link_libraries" middle " Qt5::Network ${EXTRA_LIBS}"))))))
" Qt5::Network ${EXTRA_LIBS}")))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
#:parallel-build? #f ;occasionally fails with '-j'
#:phases (modify-phases %standard-phases
(add-after 'unpack 'help-valgrind
(lambda* (#:key inputs #:allow-other-keys)
(let ((debug (search-input-directory inputs
"/lib/debug")))
(substitute* "tests/common/CMakeLists.txt"
(("--error-exitcode=1" flag)
(string-append "--extra-debuginfo-path="
debug " " flag)))))))))
(native-inputs (native-inputs
(list pkg-config valgrind)) ;for tests (list pkg-config
valgrind ;for tests
`(,(canonical-package glibc) "debug")))
(inputs (inputs
(list dashel (list dashel
enki enki