From 9086c643122cabb85500553e3875f6c1198b6a28 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Wed, 22 Feb 2023 22:59:24 +0000 Subject: [PATCH 01/29] musl: backport `qsort_r`. --- ...allocarray.patch => 00-reallocarray.patch} | 0 srcpkgs/musl/patches/add-qsort_r.patch | 201 ++++++++++++++++++ srcpkgs/musl/template | 6 +- 3 files changed, 204 insertions(+), 3 deletions(-) rename srcpkgs/musl/patches/{reallocarray.patch => 00-reallocarray.patch} (100%) create mode 100644 srcpkgs/musl/patches/add-qsort_r.patch diff --git a/srcpkgs/musl/patches/reallocarray.patch b/srcpkgs/musl/patches/00-reallocarray.patch similarity index 100% rename from srcpkgs/musl/patches/reallocarray.patch rename to srcpkgs/musl/patches/00-reallocarray.patch diff --git a/srcpkgs/musl/patches/add-qsort_r.patch b/srcpkgs/musl/patches/add-qsort_r.patch new file mode 100644 index 000000000000..3d85496afb69 --- /dev/null +++ b/srcpkgs/musl/patches/add-qsort_r.patch @@ -0,0 +1,201 @@ +From b76f37fd5625d038141b52184956fb4b7838e9a5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89rico=20Nogueira?= +Date: Tue, 9 Mar 2021 18:02:13 -0300 +Subject: [PATCH] add qsort_r and make qsort a wrapper around it + +we make qsort a wrapper by providing a wrapper_cmp function that uses +the extra argument as a function pointer. should be optimized to a tail +call on most architectures, as long as it's built with +-fomit-frame-pointer, so the performance impact should be minimal. + +to keep the git history clean, for now qsort_r is implemented in qsort.c +and qsort is implemented in qsort_nr.c. qsort.c also received a few +trivial cleanups, including replacing (*cmp)() calls with cmp(). +qsort_nr.c contains only wrapper_cmp and qsort as a qsort_r wrapper +itself. +--- + include/stdlib.h | 1 + + src/include/stdlib.h | 1 + + src/stdlib/qsort.c | 37 ++++++++++++++++++++----------------- + src/stdlib/qsort_nr.c | 14 ++++++++++++++ + 4 files changed, 36 insertions(+), 17 deletions(-) + create mode 100644 src/stdlib/qsort_nr.c + +diff --git a/include/stdlib.h b/include/stdlib.h +index b54a051fe..7af86e3bc 100644 +--- a/include/stdlib.h ++++ b/include/stdlib.h +@@ -146,6 +146,7 @@ int clearenv(void); + #define WCOREDUMP(s) ((s) & 0x80) + #define WIFCONTINUED(s) ((s) == 0xffff) + void *reallocarray (void *, size_t, size_t); ++void qsort_r (void *, size_t, size_t, int (*)(const void *, const void *, void *), void *); + #endif + + #ifdef _GNU_SOURCE +diff --git a/src/include/stdlib.h b/src/include/stdlib.h +index e9da20158..812b04de2 100644 +--- a/src/include/stdlib.h ++++ b/src/include/stdlib.h +@@ -8,6 +8,7 @@ hidden void __env_rm_add(char *, char *); + hidden int __mkostemps(char *, int, int); + hidden int __ptsname_r(int, char *, size_t); + hidden char *__randname(char *); ++hidden void __qsort_r (void *, size_t, size_t, int (*)(const void *, const void *, void *), void *); + + hidden void *__libc_malloc(size_t); + hidden void *__libc_malloc_impl(size_t); +diff --git a/src/stdlib/qsort.c b/src/stdlib/qsort.c +index da58fd317..314ddc29d 100644 +--- a/src/stdlib/qsort.c ++++ b/src/stdlib/qsort.c +@@ -24,6 +24,7 @@ + /* Smoothsort, an adaptive variant of Heapsort. Memory usage: O(1). + Run time: Worst case O(n log n), close to O(n) in the mostly-sorted case. */ + ++#define _BSD_SOURCE + #include + #include + #include +@@ -31,7 +32,7 @@ + #include "atomic.h" + #define ntz(x) a_ctz_l((x)) + +-typedef int (*cmpfun)(const void *, const void *); ++typedef int (*cmpfun)(const void *, const void *, void *); + + static inline int pntz(size_t p[2]) { + int r = ntz(p[0] - 1); +@@ -88,7 +89,7 @@ static inline void shr(size_t p[2], int n) + p[1] >>= n; + } + +-static void sift(unsigned char *head, size_t width, cmpfun cmp, int pshift, size_t lp[]) ++static void sift(unsigned char *head, size_t width, cmpfun cmp, void *arg, int pshift, size_t lp[]) + { + unsigned char *rt, *lf; + unsigned char *ar[14 * sizeof(size_t) + 1]; +@@ -99,10 +100,10 @@ static void sift(unsigned char *head, size_t width, cmpfun cmp, int pshift, size + rt = head - width; + lf = head - width - lp[pshift - 2]; + +- if((*cmp)(ar[0], lf) >= 0 && (*cmp)(ar[0], rt) >= 0) { ++ if(cmp(ar[0], lf, arg) >= 0 && cmp(ar[0], rt, arg) >= 0) { + break; + } +- if((*cmp)(lf, rt) >= 0) { ++ if(cmp(lf, rt, arg) >= 0) { + ar[i++] = lf; + head = lf; + pshift -= 1; +@@ -115,7 +116,7 @@ static void sift(unsigned char *head, size_t width, cmpfun cmp, int pshift, size + cycle(width, ar, i); + } + +-static void trinkle(unsigned char *head, size_t width, cmpfun cmp, size_t pp[2], int pshift, int trusty, size_t lp[]) ++static void trinkle(unsigned char *head, size_t width, cmpfun cmp, void *arg, size_t pp[2], int pshift, int trusty, size_t lp[]) + { + unsigned char *stepson, + *rt, *lf; +@@ -130,13 +131,13 @@ static void trinkle(unsigned char *head, size_t width, cmpfun cmp, size_t pp[2], + ar[0] = head; + while(p[0] != 1 || p[1] != 0) { + stepson = head - lp[pshift]; +- if((*cmp)(stepson, ar[0]) <= 0) { ++ if(cmp(stepson, ar[0], arg) <= 0) { + break; + } + if(!trusty && pshift > 1) { + rt = head - width; + lf = head - width - lp[pshift - 2]; +- if((*cmp)(rt, stepson) >= 0 || (*cmp)(lf, stepson) >= 0) { ++ if(cmp(rt, stepson, arg) >= 0 || cmp(lf, stepson, arg) >= 0) { + break; + } + } +@@ -150,11 +151,11 @@ static void trinkle(unsigned char *head, size_t width, cmpfun cmp, size_t pp[2], + } + if(!trusty) { + cycle(width, ar, i); +- sift(head, width, cmp, pshift, lp); ++ sift(head, width, cmp, arg, pshift, lp); + } + } + +-void qsort(void *base, size_t nel, size_t width, cmpfun cmp) ++void __qsort_r(void *base, size_t nel, size_t width, cmpfun cmp, void *arg) + { + size_t lp[12*sizeof(size_t)]; + size_t i, size = width * nel; +@@ -173,16 +174,16 @@ void qsort(void *base, size_t nel, size_t width, cmpfun cmp) + + while(head < high) { + if((p[0] & 3) == 3) { +- sift(head, width, cmp, pshift, lp); ++ sift(head, width, cmp, arg, pshift, lp); + shr(p, 2); + pshift += 2; + } else { + if(lp[pshift - 1] >= high - head) { +- trinkle(head, width, cmp, p, pshift, 0, lp); ++ trinkle(head, width, cmp, arg, p, pshift, 0, lp); + } else { +- sift(head, width, cmp, pshift, lp); ++ sift(head, width, cmp, arg, pshift, lp); + } +- ++ + if(pshift == 1) { + shl(p, 1); + pshift = 0; +@@ -191,12 +192,12 @@ void qsort(void *base, size_t nel, size_t width, cmpfun cmp) + pshift = 1; + } + } +- ++ + p[0] |= 1; + head += width; + } + +- trinkle(head, width, cmp, p, pshift, 0, lp); ++ trinkle(head, width, cmp, arg, p, pshift, 0, lp); + + while(pshift != 1 || p[0] != 1 || p[1] != 0) { + if(pshift <= 1) { +@@ -208,11 +209,13 @@ void qsort(void *base, size_t nel, size_t width, cmpfun cmp) + pshift -= 2; + p[0] ^= 7; + shr(p, 1); +- trinkle(head - lp[pshift] - width, width, cmp, p, pshift + 1, 1, lp); ++ trinkle(head - lp[pshift] - width, width, cmp, arg, p, pshift + 1, 1, lp); + shl(p, 1); + p[0] |= 1; +- trinkle(head - width, width, cmp, p, pshift, 1, lp); ++ trinkle(head - width, width, cmp, arg, p, pshift, 1, lp); + } + head -= width; + } + } ++ ++weak_alias(__qsort_r, qsort_r); +diff --git a/src/stdlib/qsort_nr.c b/src/stdlib/qsort_nr.c +new file mode 100644 +index 000000000..efe7ccecd +--- /dev/null ++++ b/src/stdlib/qsort_nr.c +@@ -0,0 +1,14 @@ ++#define _BSD_SOURCE ++#include ++ ++typedef int (*cmpfun)(const void *, const void *); ++ ++static int wrapper_cmp(const void *v1, const void *v2, void *cmp) ++{ ++ return ((cmpfun)cmp)(v1, v2); ++} ++ ++void qsort(void *base, size_t nel, size_t width, cmpfun cmp) ++{ ++ __qsort_r(base, nel, width, wrapper_cmp, cmp); ++} diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index d661507241d4..c77cc2b6c405 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -2,7 +2,7 @@ pkgname=musl reverts="1.2.0_1" version=1.1.24 -revision=14 +revision=15 archs="*-musl" bootstrap=yes build_style=gnu-configure @@ -10,8 +10,8 @@ configure_args="--prefix=/usr --disable-gcc-wrapper" short_desc="Musl C library" maintainer="Enno Boland " license="MIT" -homepage="http://www.musl-libc.org/" -distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz" +homepage="https://musl.libc.org/" +distfiles="https://musl.libc.org/releases/musl-${version}.tar.gz" checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 nostrip_files="libc.so" From 59e887d621d527819bfc18c12081dabee1ca5cf3 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:27 +0000 Subject: [PATCH 02/29] cross-aarch64-linux-musl: revbump for musl-1.1.24_15. --- 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 a05207a8894e..8038b28d70ad 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.35 -revision=2 +revision=3 build_style=void-cross configure_args="--with-arch=armv8-a" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" From bae3213b102f1c862772f55ec1996f98066474d8 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:28 +0000 Subject: [PATCH 03/29] cross-aarch64-linux-musl: revbump for musl-1.1.24_15. --- 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 8038b28d70ad..80d2fedb7e9c 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.35 -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 48d825789ac5fa6a42347fdf522506f9c9658caa Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:29 +0000 Subject: [PATCH 04/29] cross-arm-linux-musleabi: revbump for musl-1.1.24_15. --- 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 ce25d306db4b..ee59931d6d93 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.35 -revision=2 +revision=3 build_style=void-cross configure_args="--with-arch=armv5te --with-float=soft" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" From 39f2da50ddfea32487d30d7ed5216478a9ff08bb Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:29 +0000 Subject: [PATCH 05/29] cross-arm-linux-musleabi: revbump for musl-1.1.24_15. --- 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 ee59931d6d93..e98a384ffadf 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.35 -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 48e6fa54f364b057bb0b303f72759e1cf96fecb1 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:30 +0000 Subject: [PATCH 06/29] cross-arm-linux-musleabihf: revbump for musl-1.1.24_15. --- 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 38baeb2e4df7..333db95425dd 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.35 -revision=2 +revision=3 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 3509c6b8b5d89026cf77e897226fe05b494d02cf Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:31 +0000 Subject: [PATCH 07/29] cross-arm-linux-musleabihf: revbump for musl-1.1.24_15. --- 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 333db95425dd..09a511315acd 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.35 -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 63cd01d3ee0f8071cb10f723dee8f8ab47207deb Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:31 +0000 Subject: [PATCH 08/29] cross-armv7l-linux-musleabihf: revbump for musl-1.1.24_15. --- 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 5d7bd4647c49..3c4ea2357661 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.35 -revision=2 +revision=3 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 1089019ce2d2df4f4dd22017927b245cbf591b77 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:32 +0000 Subject: [PATCH 09/29] cross-armv7l-linux-musleabihf: revbump for musl-1.1.24_15. --- 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 3c4ea2357661..c38d5836a0c3 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.35 -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 8af8d584867175f03111a02f1e0c54d5e6e177a4 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:33 +0000 Subject: [PATCH 10/29] cross-i686-linux-musl: revbump for musl-1.1.24_15. --- 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 2c95f93a8fe1..6dc3fdcba07a 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.35 -revision=2 +revision=3 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel From b399de09505d914e271916e36d4eb55e3f0fbb06 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:34 +0000 Subject: [PATCH 11/29] cross-i686-linux-musl: revbump for musl-1.1.24_15. --- 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 6dc3fdcba07a..ec8501daad33 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.35 -revision=3 +revision=4 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel From b6d997a593fec4c1f5065f969cb39cefdaee394b Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:34 +0000 Subject: [PATCH 12/29] cross-mips-linux-musl: revbump for musl-1.1.24_15. --- 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 aefd2316ad03..f783961d70d2 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.35 -revision=2 +revision=3 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=soft --with-linker-hash-style=sysv" From e611e0fcb8421e66965db5a0587aeb3bd6dda6c9 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:35 +0000 Subject: [PATCH 13/29] cross-mips-linux-musl: revbump for musl-1.1.24_15. --- 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 f783961d70d2..b50afed940f0 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.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=soft --with-linker-hash-style=sysv" From f9ec07303be427eebc0209ca9059fcab9e16a5a8 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:36 +0000 Subject: [PATCH 14/29] cross-mips-linux-muslhf: revbump for musl-1.1.24_15. --- 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 8308fcb4f0d0..fe41bc80d808 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.35 -revision=2 +revision=3 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=hard --with-linker-hash-style=sysv" From f145664c1708d69624b450b03e64b5c36deb9a17 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:36 +0000 Subject: [PATCH 15/29] cross-mips-linux-muslhf: revbump for musl-1.1.24_15. --- 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 fe41bc80d808..06bf9a58fcfe 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.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=hard --with-linker-hash-style=sysv" From 47a0fa7c0e2da2f9341a3b28ca3dd567e97f9d09 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:37 +0000 Subject: [PATCH 16/29] cross-mipsel-linux-musl: revbump for musl-1.1.24_15. --- 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 3c1825f0d96f..23247d5bc972 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.35 -revision=2 +revision=3 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=soft --with-linker-hash-style=sysv" From a25a9e1efbc237ccdb29b5fa198b812b862315b8 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:38 +0000 Subject: [PATCH 17/29] cross-mipsel-linux-musl: revbump for musl-1.1.24_15. --- 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 23247d5bc972..94c0d30484ac 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.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=soft --with-linker-hash-style=sysv" From 09b60c28d7d1171f376484f582d2e517d543fbe3 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:38 +0000 Subject: [PATCH 18/29] cross-mipsel-linux-muslhf: revbump for musl-1.1.24_15. --- 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 ab199135a246..8cc208c7e86d 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.35 -revision=2 +revision=3 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=hard --with-linker-hash-style=sysv" From ace4425e3ddbceb7a9faaa9020b4169b515fb67d Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:39 +0000 Subject: [PATCH 19/29] cross-mipsel-linux-muslhf: revbump for musl-1.1.24_15. --- 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 8cc208c7e86d..b02f4efe9918 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.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=hard --with-linker-hash-style=sysv" From 0d69a939ef8b67118c482cf5d8f4d40f8d76da30 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:40 +0000 Subject: [PATCH 20/29] cross-powerpc-linux-musl: revbump for musl-1.1.24_15. --- 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 692145be3994..e06970d76b9e 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.35 -revision=2 +revision=3 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float" From bf12579e5c3a39d17a1c14fca08c46051dc2e916 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:41 +0000 Subject: [PATCH 21/29] cross-powerpc-linux-musl: revbump for musl-1.1.24_15. --- 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 e06970d76b9e..51ec36d196e5 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.35 -revision=3 +revision=4 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float" From ec80215cdfdfceefaee3c2e37eb2407a6aa9d837 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:42 +0000 Subject: [PATCH 22/29] cross-powerpc64-linux-musl: revbump for musl-1.1.24_15. --- 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 4d38c80ff744..b081a136ef29 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.35 -revision=2 +revision=3 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux" From 4dd43fe63db78598d126bbb6fe4eac05dcd858bf Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:42 +0000 Subject: [PATCH 23/29] cross-powerpc64-linux-musl: revbump for musl-1.1.24_15. --- 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 b081a136ef29..9e942d344dd8 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.35 -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 1fac18c82fabd22ad5398aaeb1ce4f6d8b091a45 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:43 +0000 Subject: [PATCH 24/29] cross-powerpc64le-linux-musl: revbump for musl-1.1.24_15. --- 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 59f8586731a7..a863233b5b32 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.35 -revision=2 +revision=3 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux" From 595292bd8978139a5cf7d90b2e7e76d143b2e640 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:44 +0000 Subject: [PATCH 25/29] cross-powerpc64le-linux-musl: revbump for musl-1.1.24_15. --- 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 a863233b5b32..9888df6390b7 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.35 -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 21e940e12512c5643517b95c158a40871a38a53b Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:45 +0000 Subject: [PATCH 26/29] cross-powerpcle-linux-musl: revbump for musl-1.1.24_15. --- 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 0fdd3285b3f8..2f483e1f1ee5 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.35 -revision=2 +revision=3 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float" From 84f145f91001a1dc5847ccaee2e8c96b7cdcb116 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:45 +0000 Subject: [PATCH 27/29] cross-powerpcle-linux-musl: revbump for musl-1.1.24_15. --- 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 2f483e1f1ee5..5b441c0843a3 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.35 -revision=3 +revision=4 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float" From 99ef95044a859117edf97485114607cb40c6c80b Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:46 +0000 Subject: [PATCH 28/29] cross-x86_64-linux-musl: revbump for musl-1.1.24_15. --- 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 2812f3330130..4984cd77f149 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.35 -revision=2 +revision=3 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel From 7188e54382727728efe196f6265db97459f8c202 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Feb 2023 12:55:47 +0000 Subject: [PATCH 29/29] cross-x86_64-linux-musl: revbump for musl-1.1.24_15. --- 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 4984cd77f149..6c98a67b55b3 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.35 -revision=3 +revision=4 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel