amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: valgrind: Update to 3.25.1.

Browse source 
* gnu/packages/valgrind.scm (valgrind/pinned): Update to 3.25.1.
[arguments]: Use G-expressions.
[supported-systems]: Add riscv64-linux.
(valgrind): Simplify it.

Change-Id: I8a9e8c5963a5647c1eed76a95c92d8fc1f00fb05
Signed-off-by: Greg Hogan <code@greghogan.com>
This commit is contained in:
Zheng Junjie 2025-05-29 16:58:22 +08:00 • committed by Greg Hogan
parent 8a971b1718
commit fff2036c41
No known key found for this signature in database
GPG key ID: EF6EB27413CFEEF3
1 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

57
gnu/packages/valgrind.scm
View file

@ -8,6 +8,7 @@
;;; Copyright © 2022 Denis Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2022 Denis Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2025 Zheng Junjie <z572@z572.online>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -40,7 +41,7 @@
(define-public valgrind/pinned (define-public valgrind/pinned
(package (package
(name "valgrind") (name "valgrind")
(version "3.22.0") (version "3.25.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://sourceware.org/pub/valgrind" (uri (list (string-append "https://sourceware.org/pub/valgrind"
@ -49,32 +50,32 @@
"/valgrind-" version ".tar.bz2"))) "/valgrind-" version ".tar.bz2")))
(sha256 (sha256
(base32 (base32
"0k1ddnzxfpbng2sp5r31jjxsmp35g977rx6a8jcp4prcvmddn4f8")))) "1bvilavwimza3n6v5r2ypxydk737krn3n6ywxxlc4ibvfb8bipk1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("doc" ;16 MB (outputs '("doc" ;16 MB
"out")) "out"))
(arguments (arguments
`(,@(if (string-prefix? "powerpc" (or (%current-target-system) (append
(%current-system))) (if (string-prefix? "powerpc" (or (%current-target-system)
`(#:make-flags '("CFLAGS+=-maltivec")) (%current-system)))
'()) (list #:make-flags #~(list "CFLAGS+=-maltivec"))
#:phases '())
(modify-phases %standard-phases (list #:phases
(add-after 'install 'patch-suppression-files #~(modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'patch-suppression-files
;; Don't assume the FHS. (lambda _
(let* ((out (assoc-ref outputs "out")) ;; Don't assume the FHS.
(dir (string-append out "/lib/valgrind"))) (let* ((dir (string-append #$output "/lib/valgrind")))
(substitute* (find-files dir "\\.supp$") (substitute* (find-files dir "\\.supp$")
(("obj:/lib") "obj:*/lib") (("obj:/lib") "obj:*/lib")
(("obj:/usr/X11R6/lib") "obj:*/lib") (("obj:/usr/X11R6/lib") "obj:*/lib")
(("obj:/usr/lib") "obj:*/lib"))))) (("obj:/usr/lib") "obj:*/lib")))))
(add-after 'install 'install-doc (add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((orig (format #f "~a/share/doc" (assoc-ref outputs "out"))) (let ((orig (string-append #$output "/share/doc"))
(dest (format #f "~a/share" (assoc-ref outputs "doc")))) (dest (string-append #$output:doc "/share")))
(mkdir-p dest) (mkdir-p dest)
(rename-file orig dest))))))) (rename-file orig dest))))))))
(native-inputs (native-inputs
(list perl)) (list perl))
(home-page "https://www.valgrind.org/") (home-page "https://www.valgrind.org/")
@ -86,8 +87,7 @@ management and threading bugs, and profile your programs in detail. You can
also use Valgrind to build new tools.") also use Valgrind to build new tools.")
;; https://valgrind.org/info/platforms.html ;; https://valgrind.org/info/platforms.html
(supported-systems (fold delete %supported-systems (supported-systems (fold delete %supported-systems
'("i586-gnu" "x86_64-gnu" '("i586-gnu" "x86_64-gnu" "armhf-linux")))
"armhf-linux" "riscv64-linux")))
(license gpl2+) (license gpl2+)
;; Hide this variant so end users get the "interactive" Valgrind below. ;; Hide this variant so end users get the "interactive" Valgrind below.
@ -96,7 +96,7 @@ also use Valgrind to build new tools.")
(define-public valgrind (define-public valgrind
(package (package
(inherit valgrind/pinned) (inherit valgrind/pinned)
(version "3.25.0") (version "3.25.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://sourceware.org/pub/valgrind" (uri (list (string-append "https://sourceware.org/pub/valgrind"
@ -105,10 +105,7 @@ also use Valgrind to build new tools.")
"/valgrind-" version ".tar.bz2"))) "/valgrind-" version ".tar.bz2")))
(sha256 (sha256
(base32 (base32
"1k3fb1vyx1b3vvwyql0ckg9n2lyw9dilbrhw1kcw0r3b3lln0pr9")))) "1bvilavwimza3n6v5r2ypxydk737krn3n6ywxxlc4ibvfb8bipk1"))))))
(supported-systems (fold delete %supported-systems
'("i586-gnu" "x86_64-gnu"
"armhf-linux")))))
(define-public valgrind/interactive (define-public valgrind/interactive
(package/inherit valgrind (package/inherit valgrind