* Re: [PR PATCH] [Updated] Rebuild cross compilers for gettid musl patch.
2022-07-07 0:07 [PR PATCH] Rebuild cross compilers for gettid musl patch oreo639
@ 2022-07-07 0:07 ` oreo639
2022-07-07 0:36 ` oreo639
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: oreo639 @ 2022-07-07 0:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages musl
https://github.com/void-linux/void-packages/pull/37906
Rebuild cross compilers for gettid musl patch.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37906.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl-37906.patch --]
[-- Type: text/x-diff, Size: 10317 bytes --]
From 5d68d77f7b7c799c762b7499040172b9d27a16cb Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:30:08 -0700
Subject: [PATCH 01/11] cross-powerpc64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 9b7216648abb..1ebd0fb2048d 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 6200d2f3770ba27d879527cd2ed53182f052f9c1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:40:52 -0700
Subject: [PATCH 02/11] cross-powerpc-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9cea58a44f20..f9b22f0610d3 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 97e6e05da9688d9d43bfbd38c668c7d1e4537dde Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:19 -0700
Subject: [PATCH 03/11] cross-powerpcle-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 3dfd9032f5b4..ec9324ddaa99 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From e55aa9857dc8bf89627383e984d0c22b62fc24dd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:32 -0700
Subject: [PATCH 04/11] cross-powerpc64le-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0401722c90ab..76a70aa1d6db 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From c07f020e85d9ce6af16ddcca21eae2b819fd4e52 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:15 -0700
Subject: [PATCH 05/11] cross-mips-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 9d1bf7fd9951..9b5d5819b1a0 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 7c7d42cf576a46e1e9ac58eee1d7a0abe96c0ff0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:26 -0700
Subject: [PATCH 06/11] cross-mipsel-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 5f425dc01d05..1acba7016dbc 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 104d7e66fa4d93028873447c14b795a385a43b25 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:14 -0700
Subject: [PATCH 07/11] cross-i686-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 5fba2dd44463..8be16a230d8d 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 8900fbd4ab4464a92b2eb1a38b4eaf2bf7383e7d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:39 -0700
Subject: [PATCH 08/11] cross-x86_64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index db608fece120..a941e7e02f6f 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From ab7ba5e05bf30dfc4f37577e1b79926abaac0ad9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:08 -0700
Subject: [PATCH 09/11] cross-aarch64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 5e32c41f7b83..bb6a770afb79 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 04bf1ceaee2f69e169b40768588445a7a4e6e792 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:46 -0700
Subject: [PATCH 10/11] cross-arm-linux-musleabi: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 3082fc967aed..6692d891e1bd 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 132eff198cf827604b3bd7c5d1bf3fe22cca1a85 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:50:02 -0700
Subject: [PATCH 11/11] mutter: remove gettid patch
This patch was temporarily added to resolve a build failure that required
rebuilding the musl cross compilers.
---
srcpkgs/mutter/patches/gettid.patch | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/gettid.patch
diff --git a/srcpkgs/mutter/patches/gettid.patch b/srcpkgs/mutter/patches/gettid.patch
deleted file mode 100644
index d8e4e90d0bb4..000000000000
--- a/srcpkgs/mutter/patches/gettid.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-gettid wasn't implemented in musl until 1.2.2+
-
-diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
-index 2245387..2842593 100644
---- a/src/backends/native/meta-backend-native.c
-+++ b/src/backends/native/meta-backend-native.c
-@@ -39,6 +39,7 @@
- #include "backends/native/meta-input-thread.h"
-
- #include <stdlib.h>
-+#include <syscall.h>
-
- #include "backends/meta-cursor-tracker-private.h"
- #include "backends/meta-idle-manager.h"
-@@ -231,7 +232,7 @@ meta_backend_native_post_init (MetaBackend *backend)
-
- priority = sched_get_priority_min (SCHED_RR);
- meta_dbus_realtime_kit1_call_make_thread_realtime_sync (rtkit_proxy,
-- gettid (),
-+ (pid_t) syscall (SYS_gettid),
- priority,
- NULL,
- &error);
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] Rebuild cross compilers for gettid musl patch.
2022-07-07 0:07 [PR PATCH] Rebuild cross compilers for gettid musl patch oreo639
2022-07-07 0:07 ` [PR PATCH] [Updated] " oreo639
@ 2022-07-07 0:36 ` oreo639
2022-07-07 1:08 ` oreo639
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: oreo639 @ 2022-07-07 0:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1378 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages musl
https://github.com/void-linux/void-packages/pull/37906
Rebuild cross compilers for gettid musl patch.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This resolves https://github.com/void-linux/void-packages/commit/d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37906.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl-37906.patch --]
[-- Type: text/x-diff, Size: 10403 bytes --]
From 5d68d77f7b7c799c762b7499040172b9d27a16cb Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:30:08 -0700
Subject: [PATCH 01/11] cross-powerpc64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 9b7216648abb..1ebd0fb2048d 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 6200d2f3770ba27d879527cd2ed53182f052f9c1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:40:52 -0700
Subject: [PATCH 02/11] cross-powerpc-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9cea58a44f20..f9b22f0610d3 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 97e6e05da9688d9d43bfbd38c668c7d1e4537dde Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:19 -0700
Subject: [PATCH 03/11] cross-powerpcle-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 3dfd9032f5b4..ec9324ddaa99 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From e55aa9857dc8bf89627383e984d0c22b62fc24dd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:32 -0700
Subject: [PATCH 04/11] cross-powerpc64le-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0401722c90ab..76a70aa1d6db 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From c07f020e85d9ce6af16ddcca21eae2b819fd4e52 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:15 -0700
Subject: [PATCH 05/11] cross-mips-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 9d1bf7fd9951..9b5d5819b1a0 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 7c7d42cf576a46e1e9ac58eee1d7a0abe96c0ff0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:26 -0700
Subject: [PATCH 06/11] cross-mipsel-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 5f425dc01d05..1acba7016dbc 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 104d7e66fa4d93028873447c14b795a385a43b25 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:14 -0700
Subject: [PATCH 07/11] cross-i686-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 5fba2dd44463..8be16a230d8d 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 8900fbd4ab4464a92b2eb1a38b4eaf2bf7383e7d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:39 -0700
Subject: [PATCH 08/11] cross-x86_64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index db608fece120..a941e7e02f6f 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From ab7ba5e05bf30dfc4f37577e1b79926abaac0ad9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:08 -0700
Subject: [PATCH 09/11] cross-aarch64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 5e32c41f7b83..bb6a770afb79 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 04bf1ceaee2f69e169b40768588445a7a4e6e792 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:46 -0700
Subject: [PATCH 10/11] cross-arm-linux-musleabi: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 3082fc967aed..6692d891e1bd 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From dcea477a83dcf0dcdc400ceee3832d0690594f5e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:35:55 -0700
Subject: [PATCH 11/11] Revert "mutter: fix undefined reference to gettid"
This patch was temporarily added to resolve a build failure that required
rebuilding the musl cross compilers.
This reverts commit d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10.
---
srcpkgs/mutter/patches/gettid.patch | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/gettid.patch
diff --git a/srcpkgs/mutter/patches/gettid.patch b/srcpkgs/mutter/patches/gettid.patch
deleted file mode 100644
index d8e4e90d0bb4..000000000000
--- a/srcpkgs/mutter/patches/gettid.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-gettid wasn't implemented in musl until 1.2.2+
-
-diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
-index 2245387..2842593 100644
---- a/src/backends/native/meta-backend-native.c
-+++ b/src/backends/native/meta-backend-native.c
-@@ -39,6 +39,7 @@
- #include "backends/native/meta-input-thread.h"
-
- #include <stdlib.h>
-+#include <syscall.h>
-
- #include "backends/meta-cursor-tracker-private.h"
- #include "backends/meta-idle-manager.h"
-@@ -231,7 +232,7 @@ meta_backend_native_post_init (MetaBackend *backend)
-
- priority = sched_get_priority_min (SCHED_RR);
- meta_dbus_realtime_kit1_call_make_thread_realtime_sync (rtkit_proxy,
-- gettid (),
-+ (pid_t) syscall (SYS_gettid),
- priority,
- NULL,
- &error);
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] Rebuild cross compilers for gettid musl patch.
2022-07-07 0:07 [PR PATCH] Rebuild cross compilers for gettid musl patch oreo639
2022-07-07 0:07 ` [PR PATCH] [Updated] " oreo639
2022-07-07 0:36 ` oreo639
@ 2022-07-07 1:08 ` oreo639
2022-07-07 1:10 ` oreo639
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: oreo639 @ 2022-07-07 1:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1380 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages musl
https://github.com/void-linux/void-packages/pull/37906
Rebuild cross compilers for gettid musl patch.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This resolves https://github.com/void-linux/void-packages/commit/d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37906.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl-37906.patch --]
[-- Type: text/x-diff, Size: 11290 bytes --]
From 5d68d77f7b7c799c762b7499040172b9d27a16cb Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:30:08 -0700
Subject: [PATCH 01/12] cross-powerpc64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 9b7216648abb..1ebd0fb2048d 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 6200d2f3770ba27d879527cd2ed53182f052f9c1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:40:52 -0700
Subject: [PATCH 02/12] cross-powerpc-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9cea58a44f20..f9b22f0610d3 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 97e6e05da9688d9d43bfbd38c668c7d1e4537dde Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:19 -0700
Subject: [PATCH 03/12] cross-powerpcle-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 3dfd9032f5b4..ec9324ddaa99 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From e55aa9857dc8bf89627383e984d0c22b62fc24dd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:32 -0700
Subject: [PATCH 04/12] cross-powerpc64le-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0401722c90ab..76a70aa1d6db 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From c07f020e85d9ce6af16ddcca21eae2b819fd4e52 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:15 -0700
Subject: [PATCH 05/12] cross-mips-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 9d1bf7fd9951..9b5d5819b1a0 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 7c7d42cf576a46e1e9ac58eee1d7a0abe96c0ff0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:26 -0700
Subject: [PATCH 06/12] cross-mipsel-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 5f425dc01d05..1acba7016dbc 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 104d7e66fa4d93028873447c14b795a385a43b25 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:14 -0700
Subject: [PATCH 07/12] cross-i686-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 5fba2dd44463..8be16a230d8d 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 8900fbd4ab4464a92b2eb1a38b4eaf2bf7383e7d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:39 -0700
Subject: [PATCH 08/12] cross-x86_64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index db608fece120..a941e7e02f6f 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From ab7ba5e05bf30dfc4f37577e1b79926abaac0ad9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:08 -0700
Subject: [PATCH 09/12] cross-aarch64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 5e32c41f7b83..bb6a770afb79 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 04bf1ceaee2f69e169b40768588445a7a4e6e792 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:46 -0700
Subject: [PATCH 10/12] cross-arm-linux-musleabi: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 3082fc967aed..6692d891e1bd 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From cb8f8d4cc43cd3c7b97bf2942ca9611206650c13 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:08:17 -0700
Subject: [PATCH 11/12] cross-arm-linux-musleabihf: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 98ed4d433e4d..bb62bd5ebc55 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 057f9765ed23116d3f58d48b1935874307f69c01 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:35:55 -0700
Subject: [PATCH 12/12] Revert "mutter: fix undefined reference to gettid"
This patch was temporarily added to resolve a build failure that required
rebuilding the musl cross compilers.
This reverts commit d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10.
---
srcpkgs/mutter/patches/gettid.patch | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/gettid.patch
diff --git a/srcpkgs/mutter/patches/gettid.patch b/srcpkgs/mutter/patches/gettid.patch
deleted file mode 100644
index d8e4e90d0bb4..000000000000
--- a/srcpkgs/mutter/patches/gettid.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-gettid wasn't implemented in musl until 1.2.2+
-
-diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
-index 2245387..2842593 100644
---- a/src/backends/native/meta-backend-native.c
-+++ b/src/backends/native/meta-backend-native.c
-@@ -39,6 +39,7 @@
- #include "backends/native/meta-input-thread.h"
-
- #include <stdlib.h>
-+#include <syscall.h>
-
- #include "backends/meta-cursor-tracker-private.h"
- #include "backends/meta-idle-manager.h"
-@@ -231,7 +232,7 @@ meta_backend_native_post_init (MetaBackend *backend)
-
- priority = sched_get_priority_min (SCHED_RR);
- meta_dbus_realtime_kit1_call_make_thread_realtime_sync (rtkit_proxy,
-- gettid (),
-+ (pid_t) syscall (SYS_gettid),
- priority,
- NULL,
- &error);
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] Rebuild cross compilers for gettid musl patch.
2022-07-07 0:07 [PR PATCH] Rebuild cross compilers for gettid musl patch oreo639
` (2 preceding siblings ...)
2022-07-07 1:08 ` oreo639
@ 2022-07-07 1:10 ` oreo639
2022-07-07 17:45 ` oreo639
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: oreo639 @ 2022-07-07 1:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1380 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages musl
https://github.com/void-linux/void-packages/pull/37906
Rebuild cross compilers for gettid musl patch.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This resolves https://github.com/void-linux/void-packages/commit/d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37906.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl-37906.patch --]
[-- Type: text/x-diff, Size: 12202 bytes --]
From 5d68d77f7b7c799c762b7499040172b9d27a16cb Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:30:08 -0700
Subject: [PATCH 01/13] cross-powerpc64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 9b7216648abb..1ebd0fb2048d 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 6200d2f3770ba27d879527cd2ed53182f052f9c1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:40:52 -0700
Subject: [PATCH 02/13] cross-powerpc-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9cea58a44f20..f9b22f0610d3 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 97e6e05da9688d9d43bfbd38c668c7d1e4537dde Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:19 -0700
Subject: [PATCH 03/13] cross-powerpcle-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 3dfd9032f5b4..ec9324ddaa99 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From e55aa9857dc8bf89627383e984d0c22b62fc24dd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:32 -0700
Subject: [PATCH 04/13] cross-powerpc64le-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0401722c90ab..76a70aa1d6db 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From c07f020e85d9ce6af16ddcca21eae2b819fd4e52 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:15 -0700
Subject: [PATCH 05/13] cross-mips-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 9d1bf7fd9951..9b5d5819b1a0 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 7c7d42cf576a46e1e9ac58eee1d7a0abe96c0ff0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:26 -0700
Subject: [PATCH 06/13] cross-mipsel-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 5f425dc01d05..1acba7016dbc 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 104d7e66fa4d93028873447c14b795a385a43b25 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:14 -0700
Subject: [PATCH 07/13] cross-i686-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 5fba2dd44463..8be16a230d8d 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 8900fbd4ab4464a92b2eb1a38b4eaf2bf7383e7d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:39 -0700
Subject: [PATCH 08/13] cross-x86_64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index db608fece120..a941e7e02f6f 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From ab7ba5e05bf30dfc4f37577e1b79926abaac0ad9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:08 -0700
Subject: [PATCH 09/13] cross-aarch64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 5e32c41f7b83..bb6a770afb79 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 04bf1ceaee2f69e169b40768588445a7a4e6e792 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:46 -0700
Subject: [PATCH 10/13] cross-arm-linux-musleabi: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 3082fc967aed..6692d891e1bd 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From cb8f8d4cc43cd3c7b97bf2942ca9611206650c13 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:08:17 -0700
Subject: [PATCH 11/13] cross-arm-linux-musleabihf: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 98ed4d433e4d..bb62bd5ebc55 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 22d3745e54229656b871787e06e6ef25f3b873f2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:10:09 -0700
Subject: [PATCH 12/13] cross-armv7l-linux-musleabihf: rebuild for gettid patch
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 526c01448dd4..0a588cdf1a58 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 5d035fa33b0ad0205004fb0fad7c1ae6c987c9ad Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:35:55 -0700
Subject: [PATCH 13/13] Revert "mutter: fix undefined reference to gettid"
This patch was temporarily added to resolve a build failure that required
rebuilding the musl cross compilers.
This reverts commit d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10.
---
srcpkgs/mutter/patches/gettid.patch | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/gettid.patch
diff --git a/srcpkgs/mutter/patches/gettid.patch b/srcpkgs/mutter/patches/gettid.patch
deleted file mode 100644
index d8e4e90d0bb4..000000000000
--- a/srcpkgs/mutter/patches/gettid.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-gettid wasn't implemented in musl until 1.2.2+
-
-diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
-index 2245387..2842593 100644
---- a/src/backends/native/meta-backend-native.c
-+++ b/src/backends/native/meta-backend-native.c
-@@ -39,6 +39,7 @@
- #include "backends/native/meta-input-thread.h"
-
- #include <stdlib.h>
-+#include <syscall.h>
-
- #include "backends/meta-cursor-tracker-private.h"
- #include "backends/meta-idle-manager.h"
-@@ -231,7 +232,7 @@ meta_backend_native_post_init (MetaBackend *backend)
-
- priority = sched_get_priority_min (SCHED_RR);
- meta_dbus_realtime_kit1_call_make_thread_realtime_sync (rtkit_proxy,
-- gettid (),
-+ (pid_t) syscall (SYS_gettid),
- priority,
- NULL,
- &error);
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] Rebuild cross compilers for gettid musl patch.
2022-07-07 0:07 [PR PATCH] Rebuild cross compilers for gettid musl patch oreo639
` (3 preceding siblings ...)
2022-07-07 1:10 ` oreo639
@ 2022-07-07 17:45 ` oreo639
2022-07-08 8:40 ` oreo639
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: oreo639 @ 2022-07-07 17:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages musl
https://github.com/void-linux/void-packages/pull/37906
Rebuild cross compilers for gettid musl patch.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This resolves https://github.com/void-linux/void-packages/commit/d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10
I tested and can confirm that mutter builds without the patch after rebuilding the cross compilers.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37906.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl-37906.patch --]
[-- Type: text/x-diff, Size: 13850 bytes --]
From 5d68d77f7b7c799c762b7499040172b9d27a16cb Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:30:08 -0700
Subject: [PATCH 01/15] cross-powerpc64-linux-musl: rebuild for gettid patch
---
| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 9b7216648abb..1ebd0fb2048d 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 6200d2f3770ba27d879527cd2ed53182f052f9c1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:40:52 -0700
Subject: [PATCH 02/15] cross-powerpc-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9cea58a44f20..f9b22f0610d3 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 97e6e05da9688d9d43bfbd38c668c7d1e4537dde Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:19 -0700
Subject: [PATCH 03/15] cross-powerpcle-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 3dfd9032f5b4..ec9324ddaa99 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From e55aa9857dc8bf89627383e984d0c22b62fc24dd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:32 -0700
Subject: [PATCH 04/15] cross-powerpc64le-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0401722c90ab..76a70aa1d6db 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From c07f020e85d9ce6af16ddcca21eae2b819fd4e52 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:15 -0700
Subject: [PATCH 05/15] cross-mips-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 9d1bf7fd9951..9b5d5819b1a0 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 0edd0453c67c10a0da4aba6ff690b65b9344ab4e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:26 -0700
Subject: [PATCH 06/15] cross-mipsel-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 5f425dc01d05..1acba7016dbc 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From cc1b528b23bceef2768eb777678e4031a65e3947 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:44:33 -0700
Subject: [PATCH 07/15] cross-mips-linux-muslhf: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 47bc7b4dfa64..d7590af9ec03 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 3682990ab41a826db1a521ff6a7b8f88ec0d742c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:44:48 -0700
Subject: [PATCH 08/15] cross-mipsel-linux-muslhf: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 77826179cb3c..e4a55f028bc4 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e311eeaddf6a2610e5f8473c378eda089a65e0bf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:14 -0700
Subject: [PATCH 09/15] cross-i686-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 5fba2dd44463..8be16a230d8d 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 08bb49197ad7da3391a90190669d7069b580941f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:39 -0700
Subject: [PATCH 10/15] cross-x86_64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index db608fece120..a941e7e02f6f 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 1a8e688d3778a56e70765f1a168c7a5d97970af2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:08 -0700
Subject: [PATCH 11/15] cross-aarch64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 5e32c41f7b83..bb6a770afb79 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f17803e62af802f47da2a2d58c3e88406ef05b49 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:46 -0700
Subject: [PATCH 12/15] cross-arm-linux-musleabi: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 3082fc967aed..6692d891e1bd 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e45872c4c37fc26ac8799cf3a708330bca967ae1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:08:17 -0700
Subject: [PATCH 13/15] cross-arm-linux-musleabihf: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 98ed4d433e4d..bb62bd5ebc55 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From ab8f2e09bdc3ffe10fadabbfc3a3bc9287936ec4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:10:09 -0700
Subject: [PATCH 14/15] cross-armv7l-linux-musleabihf: rebuild for gettid patch
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 526c01448dd4..0a588cdf1a58 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6883236b78e176df7c6de720cf355586c3d365d8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:35:55 -0700
Subject: [PATCH 15/15] Revert "mutter: fix undefined reference to gettid"
This patch was temporarily added to resolve a build failure that required
rebuilding the musl cross compilers.
This reverts commit d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10.
---
srcpkgs/mutter/patches/gettid.patch | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/gettid.patch
diff --git a/srcpkgs/mutter/patches/gettid.patch b/srcpkgs/mutter/patches/gettid.patch
deleted file mode 100644
index d8e4e90d0bb4..000000000000
--- a/srcpkgs/mutter/patches/gettid.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-gettid wasn't implemented in musl until 1.2.2+
-
-diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
-index 2245387..2842593 100644
---- a/src/backends/native/meta-backend-native.c
-+++ b/src/backends/native/meta-backend-native.c
-@@ -39,6 +39,7 @@
- #include "backends/native/meta-input-thread.h"
-
- #include <stdlib.h>
-+#include <syscall.h>
-
- #include "backends/meta-cursor-tracker-private.h"
- #include "backends/meta-idle-manager.h"
-@@ -231,7 +232,7 @@ meta_backend_native_post_init (MetaBackend *backend)
-
- priority = sched_get_priority_min (SCHED_RR);
- meta_dbus_realtime_kit1_call_make_thread_realtime_sync (rtkit_proxy,
-- gettid (),
-+ (pid_t) syscall (SYS_gettid),
- priority,
- NULL,
- &error);
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] Rebuild cross compilers for gettid musl patch.
2022-07-07 0:07 [PR PATCH] Rebuild cross compilers for gettid musl patch oreo639
` (4 preceding siblings ...)
2022-07-07 17:45 ` oreo639
@ 2022-07-08 8:40 ` oreo639
2022-07-08 8:45 ` oreo639
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: oreo639 @ 2022-07-08 8:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages musl
https://github.com/void-linux/void-packages/pull/37906
Rebuild cross compilers for gettid musl patch.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This resolves https://github.com/void-linux/void-packages/commit/d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10
I tested and can confirm that mutter builds without the patch after rebuilding the cross compilers.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37906.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl-37906.patch --]
[-- Type: text/x-diff, Size: 16537 bytes --]
From 5d68d77f7b7c799c762b7499040172b9d27a16cb Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:30:08 -0700
Subject: [PATCH 01/17] cross-powerpc64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 9b7216648abb..1ebd0fb2048d 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 6200d2f3770ba27d879527cd2ed53182f052f9c1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:40:52 -0700
Subject: [PATCH 02/17] cross-powerpc-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9cea58a44f20..f9b22f0610d3 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 97e6e05da9688d9d43bfbd38c668c7d1e4537dde Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:19 -0700
Subject: [PATCH 03/17] cross-powerpcle-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 3dfd9032f5b4..ec9324ddaa99 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From e55aa9857dc8bf89627383e984d0c22b62fc24dd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:32 -0700
Subject: [PATCH 04/17] cross-powerpc64le-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0401722c90ab..76a70aa1d6db 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From c07f020e85d9ce6af16ddcca21eae2b819fd4e52 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:15 -0700
Subject: [PATCH 05/17] cross-mips-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 9d1bf7fd9951..9b5d5819b1a0 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 0edd0453c67c10a0da4aba6ff690b65b9344ab4e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:26 -0700
Subject: [PATCH 06/17] cross-mipsel-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 5f425dc01d05..1acba7016dbc 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From cc1b528b23bceef2768eb777678e4031a65e3947 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:44:33 -0700
Subject: [PATCH 07/17] cross-mips-linux-muslhf: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 47bc7b4dfa64..d7590af9ec03 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 3682990ab41a826db1a521ff6a7b8f88ec0d742c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:44:48 -0700
Subject: [PATCH 08/17] cross-mipsel-linux-muslhf: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 77826179cb3c..e4a55f028bc4 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e311eeaddf6a2610e5f8473c378eda089a65e0bf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:14 -0700
Subject: [PATCH 09/17] cross-i686-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 5fba2dd44463..8be16a230d8d 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 08bb49197ad7da3391a90190669d7069b580941f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:39 -0700
Subject: [PATCH 10/17] cross-x86_64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index db608fece120..a941e7e02f6f 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 1a8e688d3778a56e70765f1a168c7a5d97970af2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:08 -0700
Subject: [PATCH 11/17] cross-aarch64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 5e32c41f7b83..bb6a770afb79 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f17803e62af802f47da2a2d58c3e88406ef05b49 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:46 -0700
Subject: [PATCH 12/17] cross-arm-linux-musleabi: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 3082fc967aed..6692d891e1bd 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e45872c4c37fc26ac8799cf3a708330bca967ae1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:08:17 -0700
Subject: [PATCH 13/17] cross-arm-linux-musleabihf: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 98ed4d433e4d..bb62bd5ebc55 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From ab8f2e09bdc3ffe10fadabbfc3a3bc9287936ec4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:10:09 -0700
Subject: [PATCH 14/17] cross-armv7l-linux-musleabihf: rebuild for gettid patch
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 526c01448dd4..0a588cdf1a58 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6883236b78e176df7c6de720cf355586c3d365d8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:35:55 -0700
Subject: [PATCH 15/17] Revert "mutter: fix undefined reference to gettid"
This patch was temporarily added to resolve a build failure that required
rebuilding the musl cross compilers.
This reverts commit d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10.
---
srcpkgs/mutter/patches/gettid.patch | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/gettid.patch
diff --git a/srcpkgs/mutter/patches/gettid.patch b/srcpkgs/mutter/patches/gettid.patch
deleted file mode 100644
index d8e4e90d0bb4..000000000000
--- a/srcpkgs/mutter/patches/gettid.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-gettid wasn't implemented in musl until 1.2.2+
-
-diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
-index 2245387..2842593 100644
---- a/src/backends/native/meta-backend-native.c
-+++ b/src/backends/native/meta-backend-native.c
-@@ -39,6 +39,7 @@
- #include "backends/native/meta-input-thread.h"
-
- #include <stdlib.h>
-+#include <syscall.h>
-
- #include "backends/meta-cursor-tracker-private.h"
- #include "backends/meta-idle-manager.h"
-@@ -231,7 +232,7 @@ meta_backend_native_post_init (MetaBackend *backend)
-
- priority = sched_get_priority_min (SCHED_RR);
- meta_dbus_realtime_kit1_call_make_thread_realtime_sync (rtkit_proxy,
-- gettid (),
-+ (pid_t) syscall (SYS_gettid),
- priority,
- NULL,
- &error);
From d2f904bccd62ea0b86952a6a4a51d0518b18a504 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 01:37:08 -0700
Subject: [PATCH 16/17] mutter: fix typelibdir variable
Previously we were using pc_sysrootdir which is an issue since this is used for
the rpath.
---
srcpkgs/mutter/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 4064972076d9..ff2532ceb43a 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
version=42.3
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -35,7 +35,7 @@ post_install() {
# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
# meant to be called with 'pkg-config --variable'
vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
- -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+ -e 's|^typelibdir.*|typelibdir=${libdir}/mutter-10|g' \
-i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
}
From ac80163fff99ee59406ffb86458f2357566b223d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 01:38:37 -0700
Subject: [PATCH 17/17] gnome-shell: Rebuild for rpaths
The typelibdir was including pc_sysrootdir, which breaks the rpath when
cross compiling.
---
srcpkgs/gnome-shell/patches/mtl.patch | 12 ++++++++++++
srcpkgs/gnome-shell/template | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnome-shell/patches/mtl.patch
diff --git a/srcpkgs/gnome-shell/patches/mtl.patch b/srcpkgs/gnome-shell/patches/mtl.patch
new file mode 100644
index 000000000000..45d8a582d3a3
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/mtl.patch
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index 71c34e4e3..7e7d7a338 100644
+--- a/meson.build
++++ b/meson.build
+@@ -319,6 +319,7 @@ summary_dirs = {
+ 'libexecdir': get_option('libexecdir'),
+ 'datadir': get_option('datadir'),
+ 'sysconfdir': get_option('sysconfdir'),
++ 'mutter_typelibdir': mutter_typelibdir,
+ }
+
+ if get_option('man')
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 3d2e3c5cd8ec..e0a73c48c1a5 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
version=42.3
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dsystemd=false -Dtests=false"
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] Rebuild cross compilers for gettid musl patch.
2022-07-07 0:07 [PR PATCH] Rebuild cross compilers for gettid musl patch oreo639
` (5 preceding siblings ...)
2022-07-08 8:40 ` oreo639
@ 2022-07-08 8:45 ` oreo639
2022-07-08 8:53 ` oreo639
2022-07-09 4:11 ` [PR PATCH] [Merged]: " sgn
8 siblings, 0 replies; 10+ messages in thread
From: oreo639 @ 2022-07-08 8:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages musl
https://github.com/void-linux/void-packages/pull/37906
Rebuild cross compilers for gettid musl patch.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This resolves https://github.com/void-linux/void-packages/commit/d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10
I tested and can confirm that mutter builds without the patch after rebuilding the cross compilers.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37906.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl-37906.patch --]
[-- Type: text/x-diff, Size: 15847 bytes --]
From 5d68d77f7b7c799c762b7499040172b9d27a16cb Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:30:08 -0700
Subject: [PATCH 01/17] cross-powerpc64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 9b7216648abb..1ebd0fb2048d 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 6200d2f3770ba27d879527cd2ed53182f052f9c1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:40:52 -0700
Subject: [PATCH 02/17] cross-powerpc-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9cea58a44f20..f9b22f0610d3 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 97e6e05da9688d9d43bfbd38c668c7d1e4537dde Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:19 -0700
Subject: [PATCH 03/17] cross-powerpcle-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 3dfd9032f5b4..ec9324ddaa99 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From e55aa9857dc8bf89627383e984d0c22b62fc24dd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:32 -0700
Subject: [PATCH 04/17] cross-powerpc64le-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0401722c90ab..76a70aa1d6db 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From c07f020e85d9ce6af16ddcca21eae2b819fd4e52 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:15 -0700
Subject: [PATCH 05/17] cross-mips-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 9d1bf7fd9951..9b5d5819b1a0 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 0edd0453c67c10a0da4aba6ff690b65b9344ab4e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:26 -0700
Subject: [PATCH 06/17] cross-mipsel-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 5f425dc01d05..1acba7016dbc 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From cc1b528b23bceef2768eb777678e4031a65e3947 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:44:33 -0700
Subject: [PATCH 07/17] cross-mips-linux-muslhf: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 47bc7b4dfa64..d7590af9ec03 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 3682990ab41a826db1a521ff6a7b8f88ec0d742c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:44:48 -0700
Subject: [PATCH 08/17] cross-mipsel-linux-muslhf: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 77826179cb3c..e4a55f028bc4 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e311eeaddf6a2610e5f8473c378eda089a65e0bf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:14 -0700
Subject: [PATCH 09/17] cross-i686-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 5fba2dd44463..8be16a230d8d 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 08bb49197ad7da3391a90190669d7069b580941f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:39 -0700
Subject: [PATCH 10/17] cross-x86_64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index db608fece120..a941e7e02f6f 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 1a8e688d3778a56e70765f1a168c7a5d97970af2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:08 -0700
Subject: [PATCH 11/17] cross-aarch64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 5e32c41f7b83..bb6a770afb79 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f17803e62af802f47da2a2d58c3e88406ef05b49 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:46 -0700
Subject: [PATCH 12/17] cross-arm-linux-musleabi: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 3082fc967aed..6692d891e1bd 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e45872c4c37fc26ac8799cf3a708330bca967ae1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:08:17 -0700
Subject: [PATCH 13/17] cross-arm-linux-musleabihf: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 98ed4d433e4d..bb62bd5ebc55 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From ab8f2e09bdc3ffe10fadabbfc3a3bc9287936ec4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:10:09 -0700
Subject: [PATCH 14/17] cross-armv7l-linux-musleabihf: rebuild for gettid patch
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 526c01448dd4..0a588cdf1a58 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6883236b78e176df7c6de720cf355586c3d365d8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:35:55 -0700
Subject: [PATCH 15/17] Revert "mutter: fix undefined reference to gettid"
This patch was temporarily added to resolve a build failure that required
rebuilding the musl cross compilers.
This reverts commit d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10.
---
srcpkgs/mutter/patches/gettid.patch | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/gettid.patch
diff --git a/srcpkgs/mutter/patches/gettid.patch b/srcpkgs/mutter/patches/gettid.patch
deleted file mode 100644
index d8e4e90d0bb4..000000000000
--- a/srcpkgs/mutter/patches/gettid.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-gettid wasn't implemented in musl until 1.2.2+
-
-diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
-index 2245387..2842593 100644
---- a/src/backends/native/meta-backend-native.c
-+++ b/src/backends/native/meta-backend-native.c
-@@ -39,6 +39,7 @@
- #include "backends/native/meta-input-thread.h"
-
- #include <stdlib.h>
-+#include <syscall.h>
-
- #include "backends/meta-cursor-tracker-private.h"
- #include "backends/meta-idle-manager.h"
-@@ -231,7 +232,7 @@ meta_backend_native_post_init (MetaBackend *backend)
-
- priority = sched_get_priority_min (SCHED_RR);
- meta_dbus_realtime_kit1_call_make_thread_realtime_sync (rtkit_proxy,
-- gettid (),
-+ (pid_t) syscall (SYS_gettid),
- priority,
- NULL,
- &error);
From d2f904bccd62ea0b86952a6a4a51d0518b18a504 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 01:37:08 -0700
Subject: [PATCH 16/17] mutter: fix typelibdir variable
Previously we were using pc_sysrootdir which is an issue since this is used for
the rpath.
---
srcpkgs/mutter/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 4064972076d9..ff2532ceb43a 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
version=42.3
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -35,7 +35,7 @@ post_install() {
# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
# meant to be called with 'pkg-config --variable'
vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
- -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+ -e 's|^typelibdir.*|typelibdir=${libdir}/mutter-10|g' \
-i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
}
From 21ccbea6db101aa9820cc8b055fd838ebada656f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 01:38:37 -0700
Subject: [PATCH 17/17] gnome-shell: Rebuild for rpaths
The typelibdir variable was including pc_sysrootdir, which breaks the rpath
when cross compiling.
---
srcpkgs/gnome-shell/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 3d2e3c5cd8ec..e0a73c48c1a5 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
version=42.3
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dsystemd=false -Dtests=false"
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] Rebuild cross compilers for gettid musl patch
2022-07-07 0:07 [PR PATCH] Rebuild cross compilers for gettid musl patch oreo639
` (6 preceding siblings ...)
2022-07-08 8:45 ` oreo639
@ 2022-07-08 8:53 ` oreo639
2022-07-09 4:11 ` [PR PATCH] [Merged]: " sgn
8 siblings, 0 replies; 10+ messages in thread
From: oreo639 @ 2022-07-08 8:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1482 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages musl
https://github.com/void-linux/void-packages/pull/37906
Rebuild cross compilers for gettid musl patch
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This resolves https://github.com/void-linux/void-packages/commit/d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10
I tested and can confirm that mutter builds without the patch after rebuilding the cross compilers.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37906.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl-37906.patch --]
[-- Type: text/x-diff, Size: 13850 bytes --]
From 5d68d77f7b7c799c762b7499040172b9d27a16cb Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:30:08 -0700
Subject: [PATCH 01/15] cross-powerpc64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 9b7216648abb..1ebd0fb2048d 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 6200d2f3770ba27d879527cd2ed53182f052f9c1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:40:52 -0700
Subject: [PATCH 02/15] cross-powerpc-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9cea58a44f20..f9b22f0610d3 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 97e6e05da9688d9d43bfbd38c668c7d1e4537dde Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:19 -0700
Subject: [PATCH 03/15] cross-powerpcle-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 3dfd9032f5b4..ec9324ddaa99 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From e55aa9857dc8bf89627383e984d0c22b62fc24dd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:44:32 -0700
Subject: [PATCH 04/15] cross-powerpc64le-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0401722c90ab..76a70aa1d6db 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From c07f020e85d9ce6af16ddcca21eae2b819fd4e52 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:15 -0700
Subject: [PATCH 05/15] cross-mips-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 9d1bf7fd9951..9b5d5819b1a0 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 0edd0453c67c10a0da4aba6ff690b65b9344ab4e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:45:26 -0700
Subject: [PATCH 06/15] cross-mipsel-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 5f425dc01d05..1acba7016dbc 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From cc1b528b23bceef2768eb777678e4031a65e3947 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:44:33 -0700
Subject: [PATCH 07/15] cross-mips-linux-muslhf: rebuild for gettid patch
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 47bc7b4dfa64..d7590af9ec03 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 3682990ab41a826db1a521ff6a7b8f88ec0d742c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:44:48 -0700
Subject: [PATCH 08/15] cross-mipsel-linux-muslhf: rebuild for gettid patch
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 77826179cb3c..e4a55f028bc4 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.34
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e311eeaddf6a2610e5f8473c378eda089a65e0bf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:14 -0700
Subject: [PATCH 09/15] cross-i686-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 5fba2dd44463..8be16a230d8d 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 08bb49197ad7da3391a90190669d7069b580941f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:46:39 -0700
Subject: [PATCH 10/15] cross-x86_64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index db608fece120..a941e7e02f6f 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.34
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
From 1a8e688d3778a56e70765f1a168c7a5d97970af2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:08 -0700
Subject: [PATCH 11/15] cross-aarch64-linux-musl: rebuild for gettid patch
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 5e32c41f7b83..bb6a770afb79 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f17803e62af802f47da2a2d58c3e88406ef05b49 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 16:47:46 -0700
Subject: [PATCH 12/15] cross-arm-linux-musleabi: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 3082fc967aed..6692d891e1bd 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e45872c4c37fc26ac8799cf3a708330bca967ae1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:08:17 -0700
Subject: [PATCH 13/15] cross-arm-linux-musleabihf: rebuild for gettid patch
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 98ed4d433e4d..bb62bd5ebc55 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From ab8f2e09bdc3ffe10fadabbfc3a3bc9287936ec4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:10:09 -0700
Subject: [PATCH 14/15] cross-armv7l-linux-musleabihf: rebuild for gettid patch
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 526c01448dd4..0a588cdf1a58 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6883236b78e176df7c6de720cf355586c3d365d8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:35:55 -0700
Subject: [PATCH 15/15] Revert "mutter: fix undefined reference to gettid"
This patch was temporarily added to resolve a build failure that required
rebuilding the musl cross compilers.
This reverts commit d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10.
---
srcpkgs/mutter/patches/gettid.patch | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/gettid.patch
diff --git a/srcpkgs/mutter/patches/gettid.patch b/srcpkgs/mutter/patches/gettid.patch
deleted file mode 100644
index d8e4e90d0bb4..000000000000
--- a/srcpkgs/mutter/patches/gettid.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-gettid wasn't implemented in musl until 1.2.2+
-
-diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
-index 2245387..2842593 100644
---- a/src/backends/native/meta-backend-native.c
-+++ b/src/backends/native/meta-backend-native.c
-@@ -39,6 +39,7 @@
- #include "backends/native/meta-input-thread.h"
-
- #include <stdlib.h>
-+#include <syscall.h>
-
- #include "backends/meta-cursor-tracker-private.h"
- #include "backends/meta-idle-manager.h"
-@@ -231,7 +232,7 @@ meta_backend_native_post_init (MetaBackend *backend)
-
- priority = sched_get_priority_min (SCHED_RR);
- meta_dbus_realtime_kit1_call_make_thread_realtime_sync (rtkit_proxy,
-- gettid (),
-+ (pid_t) syscall (SYS_gettid),
- priority,
- NULL,
- &error);
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Merged]: Rebuild cross compilers for gettid musl patch
2022-07-07 0:07 [PR PATCH] Rebuild cross compilers for gettid musl patch oreo639
` (7 preceding siblings ...)
2022-07-08 8:53 ` oreo639
@ 2022-07-09 4:11 ` sgn
8 siblings, 0 replies; 10+ messages in thread
From: sgn @ 2022-07-09 4:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1329 bytes --]
There's a merged pull request on the void-packages repository
Rebuild cross compilers for gettid musl patch
https://github.com/void-linux/void-packages/pull/37906
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This resolves https://github.com/void-linux/void-packages/commit/d9e7fef13f28fa63bb4c50f30ea46dd73ba95b10
I tested and can confirm that mutter builds without the patch after rebuilding the cross compilers.
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 10+ messages in thread