From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Rebuild cross compilers for gettid musl patch.
Date: Thu, 07 Jul 2022 02:36:46 +0200 [thread overview]
Message-ID: <20220707003646.QV-ZC2R39q8460niiU3Bm8_yFrS0h_o2MmNgUYPQNaI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37906@inbox.vuxu.org>
[-- 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);
next prev parent reply other threads:[~2022-07-07 0:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-07 0:07 [PR PATCH] " oreo639
2022-07-07 0:07 ` [PR PATCH] [Updated] " oreo639
2022-07-07 0:36 ` oreo639 [this message]
2022-07-07 1:08 ` oreo639
2022-07-07 1:10 ` oreo639
2022-07-07 17:45 ` oreo639
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220707003646.QV-ZC2R39q8460niiU3Bm8_yFrS0h_o2MmNgUYPQNaI@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).