[PR PATCH] mold: update to 2.4.1

[PR PATCH] mold: update to 2.4.1

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 448 bytes --]

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages mold
https://github.com/void-linux/void-packages/pull/49046

mold: update to 2.4.1
#### Testing the changes
- I tested the changes in this PR: **YES**

Use system tbb now that we have a recent enough version.

---

cc @wangp



A patch file from https://github.com/void-linux/void-packages/pull/49046.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mold-49046.patch --]
[-- Type: text/x-diff, Size: 2321 bytes --]

From 72a227baafc80797ac20259b085e57647b544185 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 2 Mar 2024 17:47:58 -0500
Subject: [PATCH] mold: update to 2.4.1

Use system tbb now that we have a recent enough version.
---
 srcpkgs/mold/patches/test-target-machine.patch |  6 +++---
 srcpkgs/mold/template                          | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mold/patches/test-target-machine.patch b/srcpkgs/mold/patches/test-target-machine.patch
index 22ec3efa14ddec..acaefb7cdb262d 100644
--- a/srcpkgs/mold/patches/test-target-machine.patch
+++ b/srcpkgs/mold/patches/test-target-machine.patch
@@ -8,10 +8,10 @@ index 8d5407a827f..8299c1dd7ac 100644
    esac
  }
  
--if [ -z "$HOST" ]; then
+-if [ -z "$MACHINE" ]; then
 +if [ -n "$XBPS_TARGET_MACHINE" ]; then
-+  HOST=$(canonical_name "${XBPS_TARGET_MACHINE%-musl}")
++  MACHINE=$(canonical_name "${XBPS_TARGET_MACHINE%-musl}")
 +else
-   HOST=$(canonical_name $(uname -m))
+   MACHINE=$(canonical_name $(uname -m))
  fi
  
diff --git a/srcpkgs/mold/template b/srcpkgs/mold/template
index 6dacc251c820ae..b759f84b96256a 100644
--- a/srcpkgs/mold/template
+++ b/srcpkgs/mold/template
@@ -1,11 +1,12 @@
 # Template file for 'mold'
 pkgname=mold
-version=2.4.0
+version=2.4.1
 revision=1
 build_style=cmake
 configure_args="-DMOLD_USE_SYSTEM_MIMALLOC=ON
- -Dmimalloc_DIR=${XBPS_CROSS_BASE}/cmake/mimalloc-2.0"
-makedepends="mimalloc-devel openssl-devel zlib-devel libzstd-devel"
+ -Dmimalloc_DIR=${XBPS_CROSS_BASE}/cmake/mimalloc-2.0
+ -DMOLD_USE_SYSTEM_TBB=ON"
+makedepends="mimalloc-devel openssl-devel zlib-devel libzstd-devel tbb-devel"
 # It's probably not worth pulling in clang/llvm to run the few tests that
 # depend on them.
 checkdepends="tar zstd libdwarf gdb"
@@ -13,8 +14,9 @@ short_desc="Faster drop-in replacement for existing Unix linkers"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="MIT"
 homepage="https://github.com/rui314/mold"
+changelog="https://github.com/rui314/mold/releases"
 distfiles="https://github.com/rui314/mold/archive/refs/tags/v${version}.tar.gz"
-checksum=be65f3d785d32ece7b3204ecaa57810847fdd25c232cf704cbfff2dafb1ac107
+checksum=c9853d007d6a1b4f3e36b7314346751f4cc91bc43c76e30db51709b53b44dd68
 
 post_install() {
 	vlicense LICENSE

Re: mold: update to 2.4.1

[wangp]

[-- Attachment #1: Type: text/plain, Size: 1187 bytes --]

New comment by wangp on void-packages repository

https://github.com/void-linux/void-packages/pull/49046#issuecomment-1974972605

Comment:
```diff
diff --git a/srcpkgs/mold/template b/srcpkgs/mold/template
index b759f84b962..d898e1b1119 100644
--- a/srcpkgs/mold/template
+++ b/srcpkgs/mold/template
@@ -3,10 +3,8 @@ pkgname=mold
 version=2.4.1
 revision=1
 build_style=cmake
-configure_args="-DMOLD_USE_SYSTEM_MIMALLOC=ON
- -Dmimalloc_DIR=${XBPS_CROSS_BASE}/cmake/mimalloc-2.0
- -DMOLD_USE_SYSTEM_TBB=ON"
-makedepends="mimalloc-devel openssl-devel zlib-devel libzstd-devel tbb-devel"
+configure_args="-DMOLD_USE_SYSTEM_MIMALLOC=ON -DMOLD_USE_SYSTEM_TBB=ON"
+makedepends="mimalloc-devel zlib-devel libzstd-devel tbb-devel"
 # It's probably not worth pulling in clang/llvm to run the few tests that
 # depend on them.
 checkdepends="tar zstd libdwarf gdb"
```
mold doesn't use openssl any more so you can remove `openssl-devel` (https://github.com/rui314/mold/issues/1088)

You can delete the `mimalloc_DIR` variable. The path doesn't exist in the current mimalloc package, so maybe it was never really necessary.

You can replace me as the maintainer if you like.

Re: [PR PATCH] [Updated] mold: update to 2.4.1

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages mold
https://github.com/void-linux/void-packages/pull/49046

mold: update to 2.4.1
#### Testing the changes
- I tested the changes in this PR: **YES**

Use system tbb now that we have a recent enough version.

---

cc @wangp



A patch file from https://github.com/void-linux/void-packages/pull/49046.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mold-49046.patch --]
[-- Type: text/x-diff, Size: 2297 bytes --]

From 7b7456f6a5e7b27c5444e708dc3b375c8f2968ac Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 5 Mar 2024 14:01:30 -0500
Subject: [PATCH] mold: update to 2.4.1

Use system tbb now that we have a recent enough version.
---
 srcpkgs/mold/patches/test-target-machine.patch |  6 +++---
 srcpkgs/mold/template                          | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/mold/patches/test-target-machine.patch b/srcpkgs/mold/patches/test-target-machine.patch
index 22ec3efa14ddec..acaefb7cdb262d 100644
--- a/srcpkgs/mold/patches/test-target-machine.patch
+++ b/srcpkgs/mold/patches/test-target-machine.patch
@@ -8,10 +8,10 @@ index 8d5407a827f..8299c1dd7ac 100644
    esac
  }
  
--if [ -z "$HOST" ]; then
+-if [ -z "$MACHINE" ]; then
 +if [ -n "$XBPS_TARGET_MACHINE" ]; then
-+  HOST=$(canonical_name "${XBPS_TARGET_MACHINE%-musl}")
++  MACHINE=$(canonical_name "${XBPS_TARGET_MACHINE%-musl}")
 +else
-   HOST=$(canonical_name $(uname -m))
+   MACHINE=$(canonical_name $(uname -m))
  fi
  
diff --git a/srcpkgs/mold/template b/srcpkgs/mold/template
index 6dacc251c820ae..d898e1b1119d19 100644
--- a/srcpkgs/mold/template
+++ b/srcpkgs/mold/template
@@ -1,11 +1,10 @@
 # Template file for 'mold'
 pkgname=mold
-version=2.4.0
+version=2.4.1
 revision=1
 build_style=cmake
-configure_args="-DMOLD_USE_SYSTEM_MIMALLOC=ON
- -Dmimalloc_DIR=${XBPS_CROSS_BASE}/cmake/mimalloc-2.0"
-makedepends="mimalloc-devel openssl-devel zlib-devel libzstd-devel"
+configure_args="-DMOLD_USE_SYSTEM_MIMALLOC=ON -DMOLD_USE_SYSTEM_TBB=ON"
+makedepends="mimalloc-devel zlib-devel libzstd-devel tbb-devel"
 # It's probably not worth pulling in clang/llvm to run the few tests that
 # depend on them.
 checkdepends="tar zstd libdwarf gdb"
@@ -13,8 +12,9 @@ short_desc="Faster drop-in replacement for existing Unix linkers"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="MIT"
 homepage="https://github.com/rui314/mold"
+changelog="https://github.com/rui314/mold/releases"
 distfiles="https://github.com/rui314/mold/archive/refs/tags/v${version}.tar.gz"
-checksum=be65f3d785d32ece7b3204ecaa57810847fdd25c232cf704cbfff2dafb1ac107
+checksum=c9853d007d6a1b4f3e36b7314346751f4cc91bc43c76e30db51709b53b44dd68
 
 post_install() {
 	vlicense LICENSE

Re: mold: update to 2.4.1

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/49046#issuecomment-1979450585

Comment:
Thank you for the corrections! Given your knowledge on mold I see no reason to remove you as maintainer (as long as you're still using Void), and I apologize for update-sniping.

Re: [PR PATCH] [Merged]: mold: update to 2.4.1

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

There's a merged pull request on the void-packages repository

mold: update to 2.4.1
https://github.com/void-linux/void-packages/pull/49046

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

Use system tbb now that we have a recent enough version.

---

cc @wangp