GNU bug report logs - #62967
[PATCH core-updates 1/2] gnu: lz4: Remove valgrind from native-inputs.

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 62967 in the body.
You can then email your comments to 62967 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: zimoun <zimon.toutoune <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: zimoun <zimon.toutoune <at> gmail.com>
Subject: [PATCH core-updates 1/2] gnu: lz4: Remove valgrind from native-inputs.
Date: Thu, 20 Apr 2023 15:17:14 +0200

* gnu/compression.scm (lz4)[native-inputs]: Remove valgrind.
[arguments]<phases>: Remove trailing #t.
---
 gnu/packages/compression.scm | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 7283a05050..8a8b94c07b 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -840,11 +840,7 @@ (define-public lz4
     (build-system gnu-build-system)
     (outputs (list "out" "static"))
     (native-inputs
-     (append
-       (list python)    ;; For tests.
-       (if (member (%current-system) (package-supported-systems valgrind))
-         (list valgrind)
-         '())))
+     (list python)) ;; For tests.
     (arguments
      `(;; Not designed for parallel testing.
        ;; See https://github.com/lz4/lz4/issues/957#issuecomment-737419821
@@ -860,16 +856,14 @@ (define-public lz4
              (substitute* "tests/Makefile"
                ;; This fails when $prefix is not a single top-level directory.
                (("^test: (.*) test-install" _ targets)
-                (string-append "test: " targets)))
-             #t))
+                (string-append "test: " targets)))))
          (add-after 'install 'move-static-library
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out"))
                    (static (assoc-ref outputs "static")))
                (mkdir-p (string-append static "/lib"))
                (rename-file (string-append out "/lib/liblz4.a")
-                            (string-append static "/lib/liblz4.a"))
-               #t))))))
+                            (string-append static "/lib/liblz4.a"))))))))
     (home-page "https://www.lz4.org")
     (synopsis "Compression algorithm focused on speed")
     (description "LZ4 is a lossless compression algorithm, providing

base-commit: c0ac055918ec1eee53c7e14f62c2e3516321588b
-- 
2.38.1

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

From: zimoun <zimon.toutoune <at> gmail.com>
To: 62967 <at> debbugs.gnu.org
Cc: andreas <at> enge.fr, zimoun <zimon.toutoune <at> gmail.com>
Subject: [PATCH core-updates 2/2] gnu: valgrind: Update to 3.20.0.
Date: Thu, 20 Apr 2023 15:23:33 +0200

* gnu/packages/valgrind.scm (valgrind): Update to 3.20.0.
[arguments]<phases>: Remove trailing #t.
---
 gnu/packages/valgrind.scm | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm
index 204dd4a3c5..113cf614c2 100644
--- a/gnu/packages/valgrind.scm
+++ b/gnu/packages/valgrind.scm
@@ -40,7 +40,7 @@ (define-public valgrind
     (name "valgrind")
     ;; Note: check "guix refresh -l -e '(@ (gnu packages valgrind) valgrind)'"
     ;; when updating this package to find which branch it should go to.
-    (version "3.17.0")
+    (version "3.20.0")
     (source (origin
               (method url-fetch)
               (uri (list (string-append "https://sourceware.org/pub/valgrind"
@@ -49,8 +49,7 @@ (define-public valgrind
                                         "/valgrind-" version ".tar.bz2")))
               (sha256
                (base32
-                "18l5jbk301j3462gipqn9bkfx44mdmwn0pwr73r40gl1irkfqfmd"))
-              (patches (search-patches "valgrind-enable-arm.patch"))))
+                "1ipkp6yi202pml2r0qwflysmq86dkqd8iyi1y51d6y70vcqw0dl5"))))
     (build-system gnu-build-system)
     (outputs '("doc"                              ;16 MB
                "out"))
@@ -69,15 +68,13 @@ (define-public valgrind
                (substitute* (find-files dir "\\.supp$")
                  (("obj:/lib") "obj:*/lib")
                  (("obj:/usr/X11R6/lib") "obj:*/lib")
-                 (("obj:/usr/lib") "obj:*/lib"))
-               #t)))
+                 (("obj:/usr/lib") "obj:*/lib")))))
          (add-after 'install 'install-doc
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((orig (format #f "~a/share/doc" (assoc-ref outputs "out")))
                    (dest (format #f "~a/share" (assoc-ref outputs "doc"))))
                (mkdir-p dest)
-               (rename-file orig dest)
-               #t))))))
+               (rename-file orig dest)))))))
     (native-inputs
      (list perl))
     (home-page "https://www.valgrind.org/")
@@ -97,16 +94,6 @@ (define-public valgrind
 (define-public valgrind/interactive
   (package/inherit
    valgrind
-   (version "3.20.0")
-   (source (origin
-             (method url-fetch)
-             (uri (list (string-append "https://sourceware.org/pub/valgrind"
-                                       "/valgrind-" version ".tar.bz2")
-                        (string-append "ftp://sourceware.org/pub/valgrind"
-                                       "/valgrind-" version ".tar.bz2")))
-             (sha256
-              (base32
-               "1ipkp6yi202pml2r0qwflysmq86dkqd8iyi1y51d6y70vcqw0dl5"))))
    (inputs
     ;; GDB is needed to provide a sane default for `--db-command'.
     (list gdb `(,(canonical-package glibc) "debug")))
-- 
2.38.1

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

From: Andreas Enge <andreas <at> enge.fr>
To: zimoun <zimon.toutoune <at> gmail.com>
Cc: 62967 <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 2/2] gnu: valgrind: Update to 3.20.0.
Date: Wed, 26 Apr 2023 10:50:53 +0200

Well, building this on CI is trickier than it looks at first sight:
The derivations are not changed by dropping the valgrind input from lz4,
the source code of packages downloaded via subversion is not downloaded
again, so r-minimal still fails because texlive-ms is not retried, but
just memorised as failing. I will restart a few packages by hand, and
then relaunch all failing builds.

Andreas

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

From: Andreas Enge <andreas <at> enge.fr>
To: zimoun <zimon.toutoune <at> gmail.com>
Cc: 62967-done <at> debbugs.gnu.org
Subject: Re: [PATCH core-updates 2/2] gnu: valgrind: Update to 3.20.0.
Date: Wed, 26 Apr 2023 14:31:26 +0200

And without a button to compare with current master, it is difficult to
judge. But r-minimal has built, as well as lots of R packages; I checked
a few missing ones, for which indeed a different input (not related to
valgrind) fails. KDE packages also do not build due to a test failure in
kpimcommon, which also appears on master.

So I am going to push.

Andreas

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

From: Simon Tournier <zimon.toutoune <at> gmail.com>
To: Andreas Enge <andreas <at> enge.fr>
Cc: 62967-done <at> debbugs.gnu.org
Subject: Re: bug#62967: [PATCH core-updates 2/2] gnu: valgrind: Update to
 3.20.0.
Date: Fri, 28 Apr 2023 11:41:15 +0200

Hi Andreas,

On mer., 26 avril 2023 at 14:31, Andreas Enge <andreas <at> enge.fr> wrote:
> And without a button to compare with current master, it is difficult to
> judge. But r-minimal has built, as well as lots of R packages; I checked
> a few missing ones, for which indeed a different input (not related to
> valgrind) fails. KDE packages also do not build due to a test failure in
> kpimcommon, which also appears on master.
>
> So I am going to push.

Cool!  Thanks.

Cheers,
simon

Previous Next

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