diff mbox series

[bug#73476] gnu: mold: Update to 2.34.0.

Message ID c539c47933791f72982708656cfb4467996fb734.1727273528.git.ashish.is@lostca.se
State New
Headers show
Series [bug#73476] gnu: mold: Update to 2.34.0. | expand

Commit Message

guix-patches--- via Sept. 25, 2024, 2:12 p.m. UTC 
From: Ashish SHUKLA <ashish.is@lostca.se>

* gnu/packages/mold.scm (mold): Update to 2.34.0.
[arguments](phases)<force-system-xxhash>: Update path.
<fix-compiler-name-in-test>: Update path.
<skip-tbb-lto-test>: Update path.
<disable-rpath-test>: Update path.

Change-Id: I21e8cdd057fb13b508299a1b0fd9b48f803959bd
---
 gnu/packages/mold.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


base-commit: 039635567d17460d8d541caa58897db83a3565a8

Comments

Zheng Junjie Sept. 29, 2024, 4:35 p.m. UTC | #1 
"ashish.is--- via Guix-patches" via <guix-patches@gnu.org> writes:

> From: Ashish SHUKLA <ashish.is@lostca.se>
>
> * gnu/packages/mold.scm (mold): Update to 2.34.0.
> [arguments](phases)<force-system-xxhash>: Update path.
> <fix-compiler-name-in-test>: Update path.
> <skip-tbb-lto-test>: Update path.
> <disable-rpath-test>: Update path.

Maybe it doesn't need to be so detailed?

>
> Change-Id: I21e8cdd057fb13b508299a1b0fd9b48f803959bd
> ---
>  gnu/packages/mold.scm | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/gnu/packages/mold.scm b/gnu/packages/mold.scm
> index 322214893c..d2534de6a1 100644
> --- a/gnu/packages/mold.scm
> +++ b/gnu/packages/mold.scm
> @@ -35,7 +35,7 @@ (define-module (gnu packages mold)
>  (define-public mold
>    (package
>      (name "mold")
> -    (version "2.33.0")
> +    (version "2.34.0")
>      (source
>       (origin
>         (method git-fetch)
> @@ -44,7 +44,7 @@ (define-public mold
>               (commit (string-append "v" version))))
>         (file-name (git-file-name name version))
>         (sha256
> -        (base32 "0wsb0aiqia3jfc9k3h2d446y0mzmaq6rz9xkjf9125npdygm7kpb"))
> +        (base32 "0n8ygaxsda9ybc1jc7ap7grbziah403wjm2hmmcxzahm52v6czs0"))
>         (modules '((guix build utils)))
>         (snippet
>          #~(begin
> @@ -62,25 +62,25 @@ (define-public mold
>        #~(modify-phases %standard-phases
>            (add-before 'configure 'force-system-xxhash
>              (lambda _
> -              (substitute* "common/common.h"
> +              (substitute* "lib/common.h"
>                  (("#include \"../third-party/xxhash/xxhash.h\"")
>                   "#include <xxhash.h>"))))
>            (add-before 'configure 'fix-compiler-name-in-test
>              (lambda _
> -              (substitute* "test/elf/common.inc"
> +              (substitute* "test/common.inc"
>                  (("CC=\"\\$\\{TEST_CC:-cc\\}\"") "CC=gcc")
>                  (("CXX=\"\\$\\{TEST_CXX:-c\\+\\+\\}\"")
>                   "CXX=g++"))))
>            (add-before 'configure 'skip-tbb-lto-test
>              (lambda _
>                ;; This test needs tbb 2021.9.0 or newer
> -              (delete-file "test/elf/lto-version-script.sh")))
> +              (delete-file "test/lto-version-script.sh")))
>            (add-before 'configure 'disable-rpath-test
>              (lambda _
>                ;; This test fails because mold expect the RUNPATH as-is,
>                ;; but compiler in Guix will insert the path of gcc-lib and
>                ;; glibc into the output binary.
> -              (delete-file "test/elf/rpath.sh"))))))
> +              (delete-file "test/rpath.sh"))))))
>      (inputs (list mimalloc tbb xxhash zlib `(,zstd "lib")))
>      (home-page "https://github.com/rui314/mold")
>      (synopsis "Fast linker")
>
> base-commit: 039635567d17460d8d541caa58897db83a3565a8

push, close.
diff mbox series

Patch

diff --git a/gnu/packages/mold.scm b/gnu/packages/mold.scm
index 322214893c..d2534de6a1 100644
--- a/gnu/packages/mold.scm
+++ b/gnu/packages/mold.scm
@@ -35,7 +35,7 @@  (define-module (gnu packages mold)
 (define-public mold
   (package
     (name "mold")
-    (version "2.33.0")
+    (version "2.34.0")
     (source
      (origin
        (method git-fetch)
@@ -44,7 +44,7 @@  (define-public mold
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0wsb0aiqia3jfc9k3h2d446y0mzmaq6rz9xkjf9125npdygm7kpb"))
+        (base32 "0n8ygaxsda9ybc1jc7ap7grbziah403wjm2hmmcxzahm52v6czs0"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
@@ -62,25 +62,25 @@  (define-public mold
       #~(modify-phases %standard-phases
           (add-before 'configure 'force-system-xxhash
             (lambda _
-              (substitute* "common/common.h"
+              (substitute* "lib/common.h"
                 (("#include \"../third-party/xxhash/xxhash.h\"")
                  "#include <xxhash.h>"))))
           (add-before 'configure 'fix-compiler-name-in-test
             (lambda _
-              (substitute* "test/elf/common.inc"
+              (substitute* "test/common.inc"
                 (("CC=\"\\$\\{TEST_CC:-cc\\}\"") "CC=gcc")
                 (("CXX=\"\\$\\{TEST_CXX:-c\\+\\+\\}\"")
                  "CXX=g++"))))
           (add-before 'configure 'skip-tbb-lto-test
             (lambda _
               ;; This test needs tbb 2021.9.0 or newer
-              (delete-file "test/elf/lto-version-script.sh")))
+              (delete-file "test/lto-version-script.sh")))
           (add-before 'configure 'disable-rpath-test
             (lambda _
               ;; This test fails because mold expect the RUNPATH as-is,
               ;; but compiler in Guix will insert the path of gcc-lib and
               ;; glibc into the output binary.
-              (delete-file "test/elf/rpath.sh"))))))
+              (delete-file "test/rpath.sh"))))))
     (inputs (list mimalloc tbb xxhash zlib `(,zstd "lib")))
     (home-page "https://github.com/rui314/mold")
     (synopsis "Fast linker")