diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 17ba4ec677a691..7fca6b575080af 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-}"
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 8038b28d70ad8f..a633fa900da3ad 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-}"
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index 5aa1383aa8f927..dbb8d90c8c2449 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-}"
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index 13a78079437876..1a04ad3713af3d 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-}"
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index ee59931d6d93ed..8b25e9f7c365eb 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-}"
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 333db95425dd25..d6dca4e920d5a9 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-}"
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index ffb71af5b454ca..cb52dd2b291e65 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-}"
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 3c4ea235766141..5268465669fab0 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-}"
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 6dc3fdcba07a90..ea5d081e48f683 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-}"
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index c6f2579c645dd6..e71a4faa367cf1 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-}"
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index f783961d70d211..8865f6dc092b95 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-}"
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index fe41bc80d808f8..94691668dcf2f9 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-}"
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 23247d5bc972d5..a053fe5301538e 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-}"
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 8cc208c7e86d1c..29d7261e9b4818 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-}"
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index c759eda4505a07..327f3f911eb5e7 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-}"
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index e06970d76b9eab..85ea78c257f95f 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-}"
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 95e6ce653c3dcd..aaab613d01e9b9 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-}"
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index b081a136ef2973..359557d3afb9c3 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-}"
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index f4486e3f229c12..577fccc6c5f8df 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-}"
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index a863233b5b3294..57c07e1d780b48 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-}"
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 32337f1c37cc2f..340a50e2af411f 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-}"
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 2f483e1f1ee59f..4749c8965cdb32 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-}"
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index 0f6daea7229c4b..a079bb7ddbc61f 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-}"
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 4984cd77f149f5..dfce8b30d0ba96 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-}"
diff --git a/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch b/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch
new file mode 100644
index 00000000000000..a8bfa66d6c47d0
--- /dev/null
+++ b/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch
@@ -0,0 +1,139 @@
+From 98e688a9da5e7b2925dda17a2d6820dddf1fb287 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael@iodev.co.uk>
+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 <features.h>
+ 
+-#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 <bits/alltypes.h>
+ 
+-#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 <features.h>
+ 
+-#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 <features.h>
+ 
+-#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 <features.h>
+ 
+-#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 c77cc2b6c405b4..9de13710d7d39d 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