From e7bde193595ba557925c80f256d4d9f37865dd31 Mon Sep 17 00:00:00 2001 From: dkwo Date: Wed, 29 Mar 2023 14:55:46 -0400 Subject: [PATCH 01/25] musl: use nullptr for NULL in >=C++11 --- ...88a9da5e7b2925dda17a2d6820dddf1fb287.patch | 139 ++++++++++++++++++ srcpkgs/musl/template | 3 +- 2 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch diff --git a/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch b/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch new file mode 100644 index 000000000000..a8bfa66d6c47 --- /dev/null +++ b/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch @@ -0,0 +1,139 @@ +From 98e688a9da5e7b2925dda17a2d6820dddf1fb287 Mon Sep 17 00:00:00 2001 +From: Ismael Luceno +Date: Sun, 15 Aug 2021 17:51:57 +0200 +Subject: [PATCH] define NULL as nullptr when used in C++11 or later + +This should be safer for casting and more compatible with existing code +bases that wrongly assume it must be defined as a pointer. +--- + include/locale.h | 4 +++- + include/stddef.h | 4 +++- + include/stdio.h | 4 +++- + include/stdlib.h | 4 +++- + include/string.h | 4 +++- + include/time.h | 4 +++- + include/unistd.h | 4 +++- + include/wchar.h | 4 +++- + 8 files changed, 24 insertions(+), 8 deletions(-) + +diff --git a/include/locale.h b/include/locale.h +index ce384381c..11106fea8 100644 +--- a/include/locale.h ++++ b/include/locale.h +@@ -7,7 +7,9 @@ extern "C" { + + #include + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/stddef.h b/include/stddef.h +index bd7538535..f25b86396 100644 +--- a/include/stddef.h ++++ b/include/stddef.h +@@ -1,7 +1,9 @@ + #ifndef _STDDEF_H + #define _STDDEF_H + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/stdio.h b/include/stdio.h +index 3604198c3..d1ed01f03 100644 +--- a/include/stdio.h ++++ b/include/stdio.h +@@ -25,7 +25,9 @@ extern "C" { + + #include + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/stdlib.h b/include/stdlib.h +index 7af86e3bc..b507ca33b 100644 +--- a/include/stdlib.h ++++ b/include/stdlib.h +@@ -7,7 +7,9 @@ extern "C" { + + #include + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/string.h b/include/string.h +index 795a2abcd..43ad0942e 100644 +--- a/include/string.h ++++ b/include/string.h +@@ -7,7 +7,9 @@ extern "C" { + + #include + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/time.h b/include/time.h +index 5494df183..3d9483720 100644 +--- a/include/time.h ++++ b/include/time.h +@@ -7,7 +7,9 @@ extern "C" { + + #include + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/unistd.h b/include/unistd.h +index 130640260..ee2dbe8af 100644 +--- a/include/unistd.h ++++ b/include/unistd.h +@@ -15,7 +15,9 @@ extern "C" { + #define SEEK_CUR 1 + #define SEEK_END 2 + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/wchar.h b/include/wchar.h +index 88eb55b18..ed5d774df 100644 +--- a/include/wchar.h ++++ b/include/wchar.h +@@ -38,7 +38,9 @@ extern "C" { + #define WCHAR_MIN (-1-0x7fffffff+L'\0') + #endif + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) + diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index c77cc2b6c405..9de13710d7d3 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=15 +revision=16 archs="*-musl" bootstrap=yes build_style=gnu-configure @@ -24,6 +24,7 @@ post_build() { $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o $AR r libssp_nonshared.a __stack_chk_fail_local.o } + do_install() { # Move everything to /usr. vmkdir usr/lib From 90b857ace9c9fa23b3863fd61d103647edcc1394 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:27 -0400 Subject: [PATCH 02/25] cross-aarch64-linux-gnu: makedepends on isl-devel pkg-config --- srcpkgs/cross-aarch64-linux-gnu/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template index 17ba4ec677a6..7fca6b575080 100644 --- a/srcpkgs/cross-aarch64-linux-gnu/template +++ b/srcpkgs/cross-aarch64-linux-gnu/template @@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-aarch64-linux-gnu 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" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From b32d9a5c78a8bdd76855c380f4570657c84636a9 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:27 -0400 Subject: [PATCH 03/25] cross-aarch64-linux-musl: makedepends on isl-devel pkg-config --- srcpkgs/cross-aarch64-linux-musl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template index 8038b28d70ad..a633fa900da3 100644 --- a/srcpkgs/cross-aarch64-linux-musl/template +++ b/srcpkgs/cross-aarch64-linux-musl/template @@ -6,11 +6,11 @@ _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" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From ee06ef03eef0856482084dbb011a04c732536587 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:27 -0400 Subject: [PATCH 04/25] cross-arm-linux-gnueabi: makedepends on isl-devel pkg-config --- srcpkgs/cross-arm-linux-gnueabi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index 5aa1383aa8f9..dbb8d90c8c24 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-arm-linux-gnueabi 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" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 23d36ba97f0422817861fc28140419f71bd01678 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:28 -0400 Subject: [PATCH 05/25] cross-arm-linux-gnueabihf: makedepends on isl-devel pkg-config --- srcpkgs/cross-arm-linux-gnueabihf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index 13a780794378..1a04ad3713af 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -6,11 +6,11 @@ _linux_version=5.10.4 _glibc_patchver="72-g0f90d6204d" pkgname=cross-arm-linux-gnueabihf 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" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 83359e09c5556ea08da69ee6994e0dde85f143f1 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:28 -0400 Subject: [PATCH 06/25] cross-arm-linux-musleabi: makedepends on isl-devel pkg-config --- srcpkgs/cross-arm-linux-musleabi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template index ee59931d6d93..8b25e9f7c365 100644 --- a/srcpkgs/cross-arm-linux-musleabi/template +++ b/srcpkgs/cross-arm-linux-musleabi/template @@ -6,11 +6,11 @@ _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" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 1ed62bd1b8eabe9ebbe346fff1e03fc57e3e7c61 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:28 -0400 Subject: [PATCH 07/25] cross-arm-linux-musleabihf: makedepends on isl-devel pkg-config --- srcpkgs/cross-arm-linux-musleabihf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template index 333db95425dd..d6dca4e920d5 100644 --- a/srcpkgs/cross-arm-linux-musleabihf/template +++ b/srcpkgs/cross-arm-linux-musleabihf/template @@ -6,11 +6,11 @@ _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" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 2c363aae04cbcac917697af51b04f33f2c4c4baf Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:29 -0400 Subject: [PATCH 08/25] cross-armv7l-linux-gnueabihf: makedepends on isl-devel pkg-config --- srcpkgs/cross-armv7l-linux-gnueabihf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template index ffb71af5b454..cb52dd2b291e 100644 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/template +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template @@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-armv7l-linux-gnueabihf 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" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From e0cf6c8fa96feb6c91046b58167a58fc3ff3cb52 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:29 -0400 Subject: [PATCH 09/25] cross-armv7l-linux-musleabihf: makedepends on isl-devel pkg-config --- srcpkgs/cross-armv7l-linux-musleabihf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template index 3c4ea2357661..5268465669fa 100644 --- a/srcpkgs/cross-armv7l-linux-musleabihf/template +++ b/srcpkgs/cross-armv7l-linux-musleabihf/template @@ -6,11 +6,11 @@ _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" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 0de967ebb10a53c6c6dd962f7d7a7480274c693a Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:29 -0400 Subject: [PATCH 10/25] cross-i686-linux-musl: makedepends on isl-devel pkg-config --- srcpkgs/cross-i686-linux-musl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template index 6dc3fdcba07a..ea5d081e48f6 100644 --- a/srcpkgs/cross-i686-linux-musl/template +++ b/srcpkgs/cross-i686-linux-musl/template @@ -6,10 +6,10 @@ _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 +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 1d3083051cfcd46fde40867b76d3485c6e5f958b Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:30 -0400 Subject: [PATCH 11/25] cross-i686-pc-linux-gnu: makedepends on isl-devel pkg-config --- srcpkgs/cross-i686-pc-linux-gnu/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index c6f2579c645d..e71a4faa367c 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -6,10 +6,10 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-i686-pc-linux-gnu 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 +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 0aef13626cb8c72cdae840c66c87de50a758e2f6 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:30 -0400 Subject: [PATCH 12/25] cross-mipsel-linux-musl: makedepends on isl-devel pkg-config --- srcpkgs/cross-mipsel-linux-musl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template index 23247d5bc972..a053fe530153 100644 --- a/srcpkgs/cross-mipsel-linux-musl/template +++ b/srcpkgs/cross-mipsel-linux-musl/template @@ -5,12 +5,12 @@ _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" -hostmakedepends="texinfo tar gcc-objc flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From cda33ae8a23fd36398d22fb8069c70eb885e34ef Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:30 -0400 Subject: [PATCH 13/25] cross-mipsel-linux-muslhf: makedepends on isl-devel pkg-config --- srcpkgs/cross-mipsel-linux-muslhf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template index 8cc208c7e86d..29d7261e9b48 100644 --- a/srcpkgs/cross-mipsel-linux-muslhf/template +++ b/srcpkgs/cross-mipsel-linux-muslhf/template @@ -5,12 +5,12 @@ _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" -hostmakedepends="texinfo tar gcc-objc flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 4337b4eeb67d38f3f4f0451c3bb2ab235920656c Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:31 -0400 Subject: [PATCH 14/25] cross-mips-linux-musl: makedepends on isl-devel pkg-config --- srcpkgs/cross-mips-linux-musl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template index f783961d70d2..8865f6dc092b 100644 --- a/srcpkgs/cross-mips-linux-musl/template +++ b/srcpkgs/cross-mips-linux-musl/template @@ -5,12 +5,12 @@ _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" -hostmakedepends="texinfo tar gcc-objc flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From a0ccb6a5fea7f0cb9054848807acad00d83814f3 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:31 -0400 Subject: [PATCH 15/25] cross-mips-linux-muslhf: makedepends on isl-devel pkg-config --- srcpkgs/cross-mips-linux-muslhf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template index fe41bc80d808..94691668dcf2 100644 --- a/srcpkgs/cross-mips-linux-muslhf/template +++ b/srcpkgs/cross-mips-linux-muslhf/template @@ -5,12 +5,12 @@ _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" -hostmakedepends="texinfo tar gcc-objc flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 1066efdf74900ca0faeeaf39771be473a808cbee Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:31 -0400 Subject: [PATCH 16/25] cross-powerpc64le-linux-gnu: makedepends on isl-devel pkg-config --- srcpkgs/cross-powerpc64le-linux-gnu/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template index f4486e3f229c..577fccc6c5f8 100644 --- a/srcpkgs/cross-powerpc64le-linux-gnu/template +++ b/srcpkgs/cross-powerpc64le-linux-gnu/template @@ -6,12 +6,12 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-powerpc64le-linux-gnu version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2 --enable-targets=powerpcle-linux" -hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 23c41c872bc127fe4468af6fcc8379d6a456b9f1 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:32 -0400 Subject: [PATCH 17/25] cross-powerpc64le-linux-musl: makedepends on isl-devel pkg-config --- srcpkgs/cross-powerpc64le-linux-musl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template index a863233b5b32..57c07e1d780b 100644 --- a/srcpkgs/cross-powerpc64le-linux-musl/template +++ b/srcpkgs/cross-powerpc64le-linux-musl/template @@ -6,12 +6,12 @@ _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" -hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 520eb7335492c6b285db34fd12eab11ebfeebd0b Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:32 -0400 Subject: [PATCH 18/25] cross-powerpc64-linux-gnu: makedepends on isl-devel pkg-config --- srcpkgs/cross-powerpc64-linux-gnu/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template index 95e6ce653c3d..aaab613d01e9 100644 --- a/srcpkgs/cross-powerpc64-linux-gnu/template +++ b/srcpkgs/cross-powerpc64-linux-gnu/template @@ -6,12 +6,12 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-powerpc64-linux-gnu version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2 --enable-targets=powerpc-linux" -hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From e79638352a488fa62e7afd75533e7ebe9f4d6cca Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:33 -0400 Subject: [PATCH 19/25] cross-powerpc64-linux-musl: makedepends on isl-devel pkg-config --- srcpkgs/cross-powerpc64-linux-musl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template index b081a136ef29..359557d3afb9 100644 --- a/srcpkgs/cross-powerpc64-linux-musl/template +++ b/srcpkgs/cross-powerpc64-linux-musl/template @@ -6,12 +6,12 @@ _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" -hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 0a3a2f6154797993bd98a62be93854820627381c Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:33 -0400 Subject: [PATCH 20/25] cross-powerpcle-linux-gnu: makedepends on isl-devel pkg-config --- srcpkgs/cross-powerpcle-linux-gnu/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template index 32337f1c37cc..340a50e2af41 100644 --- a/srcpkgs/cross-powerpcle-linux-gnu/template +++ b/srcpkgs/cross-powerpcle-linux-gnu/template @@ -5,11 +5,11 @@ _glibc_version=2.36 _linux_version=5.10.4 pkgname=cross-powerpcle-linux-gnu version=0.35 -revision=2 +revision=3 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify" -hostmakedepends="texinfo tar gcc-objc flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 4acccf3de21a242bea80e5cc3318a436385c6478 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:33 -0400 Subject: [PATCH 21/25] cross-powerpcle-linux-musl: makedepends on isl-devel pkg-config --- srcpkgs/cross-powerpcle-linux-musl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template index 2f483e1f1ee5..4749c8965cdb 100644 --- a/srcpkgs/cross-powerpcle-linux-musl/template +++ b/srcpkgs/cross-powerpcle-linux-musl/template @@ -5,12 +5,12 @@ _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" -hostmakedepends="texinfo tar gcc-objc flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From cc876a5a995785cc4f3df04071a8fcc342dce0ff Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:34 -0400 Subject: [PATCH 22/25] cross-powerpc-linux-gnu: makedepends on isl-devel pkg-config --- srcpkgs/cross-powerpc-linux-gnu/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template index c759eda4505a..327f3f911eb5 100644 --- a/srcpkgs/cross-powerpc-linux-gnu/template +++ b/srcpkgs/cross-powerpc-linux-gnu/template @@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-powerpc-linux-gnu version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify" -hostmakedepends="texinfo tar gcc-objc flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From ce69e6364831c7e2b3daf6317fdb3376b94e844e Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:34 -0400 Subject: [PATCH 23/25] cross-powerpc-linux-musl: makedepends on isl-devel pkg-config --- srcpkgs/cross-powerpc-linux-musl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template index e06970d76b9e..85ea78c257f9 100644 --- a/srcpkgs/cross-powerpc-linux-musl/template +++ b/srcpkgs/cross-powerpc-linux-musl/template @@ -5,12 +5,12 @@ _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" -hostmakedepends="texinfo tar gcc-objc flex perl python3" -makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel +hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From bedff960eb1d854504ac82ed4931d70d827ddd56 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:34 -0400 Subject: [PATCH 24/25] cross-x86_64-linux-gnu: makedepends on isl-devel pkg-config --- srcpkgs/cross-x86_64-linux-gnu/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template index 0f6daea7229c..a079bb7ddbc6 100644 --- a/srcpkgs/cross-x86_64-linux-gnu/template +++ b/srcpkgs/cross-x86_64-linux-gnu/template @@ -6,10 +6,10 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-x86_64-linux-gnu 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 +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}" From 16b5b7e752df4565c5f5f5a5726fdfc17c9b4890 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 16 Mar 2023 14:57:35 -0400 Subject: [PATCH 25/25] cross-x86_64-linux-musl: makedepends on isl-devel pkg-config --- srcpkgs/cross-x86_64-linux-musl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index 4984cd77f149..dfce8b30d0ba 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -6,10 +6,10 @@ _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 +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" +makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel zlib-devel libzstd-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${pkgname/cross-}"