19 files changed, 25 insertions, 269 deletions
diff --git a/testing/gcc/build b/testing/gcc/build
deleted file mode 100755
index e3bb1e03..00000000
--- a/testing/gcc/build
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh -e
-
-sys_arch=${3:-$(uname -m)}
-
-sed_i() {
-    for file; do :; done
-    sed "$@" > _
-    cat _ > "$file"; rm -f _
-}
-
-# Make sure gmp is built with generic options.
-cp gcc/gmp/configfsf.guess gcc/gmp/config.guess
-cp gcc/gmp/configfsf.sub   gcc/gmp/config.sub
-
-if [ "${sys_arch#i*86}" ]; then
-    # Do not create lib64 directories
-    sed_i '/m64=/s/lib64/lib/' gcc/gcc/config/i386/t-linux64
-    sed_i 's/lib64/lib/'       gcc/gcc/config/i386/linux64.h
-else
-    # Apply libssp patch for i686.
-    (cd gcc; patch -Np1 < ../musl-libssp.patch)
-fi
-
-case "$sys_arch" in
-    i*86)   archopts="--build=i686-pc-linux-musl \
-                      --disable-libssp" ;;
-    x86_64) archopts="--build=x86_64-pc-linux-musl"
-esac
-
-# Build must happen outside of gcc source.
-mkdir -p gcc-build
-cd gcc-build
-
-export libat_cv_have_ifunc=no
-
-../gcc/configure \
-    --prefix=/usr \
-    --disable-multilib \
-    --disable-symvers \
-    --disable-libmpx \
-    --disable-libmudflap \
-    --disable-libsanitizer \
-    --disable-werror \
-    --disable-fixed-point \
-    --disable-libstdcxx-pch \
-    --disable-nls \
-    --without-included-gettext \
-    --enable-checking=release \
-    --mandir=/usr/share/man \
-    --infodir=/usr/share/info \
-    --with-system-zlib \
-    --enable-__cxa_atexit \
-    --enable-default-pie \
-    --enable-default-ssp \
-    --enable-shared \
-    --enable-threads \
-    --enable-tls \
-    --enable-languages=c,c++ \
-    $archopts \
-    --disable-bootstrap
-
-make
-make DESTDIR="$1" install
-
-# Save 35MB.
-find "$1" -name libgtkpeer.a  -exec rm -f {} +
-find "$1" -name libgjsmalsa.a -exec rm -f {} +
-find "$1" -name libgij.a      -exec rm -f {} +
-
-# Some legacy programs will expect cc
-ln -s gcc "$1/usr/bin/cc"
-
-# POSIX compliance.
-install -Dm755 ../c99 "$1/usr/bin/c99"
-
-# Symlink for LTO.
-{
-    mkdir -p "$1/usr/lib/bfd-plugins"
-
-    ln -s "/usr/libexec/gcc/$sys_arch-pc-linux-musl/$2/liblto_plugin.so" \
-        "$1/usr/lib/bfd-plugins/liblto_plugin.so"
-}
-
diff --git a/testing/gcc/checksums b/testing/gcc/checksums
deleted file mode 100644
index 27586eaf..00000000
--- a/testing/gcc/checksums
+++ /dev/null
@@ -1,6 +0,0 @@
-4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf  gcc-11.1.0.tar.xz
-fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2  gmp-6.2.1.tar.xz
-0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f  mpfr-4.1.0.tar.xz
-17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459  mpc-1.2.1.tar.gz
-765614b3396d70bca3fa0ae4a813632486c6dca320e2bd13c8c39dca52be4a4c  c99
-4ece19529edb8e681e1778e977e2ba1d47984ccfcb82505e8b898bb29d659625  musl-libssp.patch
diff --git a/testing/gcc/depends b/testing/gcc/depends
deleted file mode 100644
index 3eb45901..00000000
--- a/testing/gcc/depends
+++ /dev/null
@@ -1,4 +0,0 @@
-binutils
-byacc  make
-flex   make
-zlib
diff --git a/testing/gcc/files/c99 b/testing/gcc/files/c99
deleted file mode 100755
index 692f0924..00000000
--- a/testing/gcc/files/c99
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec cc -std=c99 "$@"
diff --git a/testing/gcc/patches/musl-libssp.patch b/testing/gcc/patches/musl-libssp.patch
deleted file mode 100644
index fe5c6143..00000000
--- a/testing/gcc/patches/musl-libssp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Timo Teräs <timo.teras@iki.fi>
-
-Alpine musl package provides libssp_nonshared.a. We link to it unconditionally,
-as otherwise we get link failures if some objects are -fstack-protector built
-and final link happens with -fno-stack-protector. This seems to be the common
-case when bootstrapping gcc, the piepatches do not seem to fully fix the
-crosstoolchain and  bootstrap sequence wrt. stack-protector flag usage.
-
---- gcc-6.1.0/gcc/gcc.c.orig
-+++ gcc-6.1.0/gcc/gcc.c
-@@ -870,8 +870,7 @@
- 
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
--#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
--		       "|fstack-protector-strong|fstack-protector-explicit:}"
-+#define LINK_SSP_SPEC "-lssp_nonshared"
- #else
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- 		       "|fstack-protector-strong|fstack-protector-explicit" \
diff --git a/testing/gcc/sources b/testing/gcc/sources
deleted file mode 100644
index 63de2a34..00000000
--- a/testing/gcc/sources
+++ /dev/null
@@ -1,6 +0,0 @@
-https://gcc.gnu.org/pub/gcc/releases/gcc-11.1.0/gcc-11.1.0.tar.xz gcc
-https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz gcc/gmp
-https://ftp.gnu.org/gnu/mpfr/mpfr-4.1.0.tar.xz gcc/mpfr
-https://ftp.gnu.org/gnu/mpc/mpc-1.2.1.tar.gz gcc/mpc
-files/c99
-patches/musl-libssp.patch
diff --git a/testing/gcc/version b/testing/gcc/version
deleted file mode 100644
index ec1ee9a6..00000000
--- a/testing/gcc/version
+++ /dev/null
@@ -1 +0,0 @@
-11.1.0 1
diff --git a/testing/libgccjit/build b/testing/libgccjit/build
deleted file mode 100755
index 6c703828..00000000
--- a/testing/libgccjit/build
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh -e
-
-# TODO Cleanup non-libgccjit items.
-
-sys_arch=${3:-$(uname -m)}
-
-sed_i() {
-    for file; do :; done
-    sed "$@" > _
-    cat _ > "$file"; rm -f _
-}
-
-if [ "${sys_arch#i*86}" ]; then
-    # Do not create lib64 directories
-    sed_i '/m64=/s/lib64/lib/' gcc/gcc/config/i386/t-linux64
-    sed_i 's/lib64/lib/'       gcc/gcc/config/i386/linux64.h
-fi
-
-# FIXME: there is an offset on the diff, causing 'busybox patch' to fail.
-(cd gcc; patch -p1 < ../gccjit-musl-fix.patch)
-
-case "$sys_arch" in
-    i*86)   archopts="--build=i686-pc-linux-musl" ;;
-    x86_64) archopts="--build=x86_64-pc-linux-musl"
-esac
-
-# Build must happen outside of gcc source.
-mkdir -p gcc-build
-cd gcc-build
-
-export libat_cv_have_ifunc=no
-
-../gcc/configure \
-    --prefix=/usr \
-    "$archopts" \
-    --disable-bootstrap \
-    --disable-fixed-point \
-    --disable-libada \
-    --disable-libquadmath \
-    --disable-libsanitizer \
-    --disable-libssp \
-    --disable-libvtv \
-    --disable-lto \
-    --disable-multilib \
-    --disable-nls \
-    --disable-symvers \
-    --disable-werror \
-    --enable-__cxa_atexit \
-    --enable-checking=release \
-    --enable-default-pie \
-    --enable-default-ssp \
-    --enable-host-shared \
-    --enable-languages=jit \
-    --enable-shared \
-    --enable-threads \
-    --enable-tls \
-    --infodir=/usr/share/info \
-    --mandir=/usr/share/man \
-    --with-system-zlib \
-    --without-included-gettext
-
-make
-make DESTDIR="$1" -C gcc install
-
-# Remove unnecessary gcc files.
-rm -rf "${1:?}/usr/bin" \
-       "${1:?}/usr/lib/gcc" \
-       "${1:?}/usr/libexec" \
-       "${1:?}/usr/share/man"
-
-# Remove info pages other than libgccjit
-find "$1/usr/share/info" -type f ! -name libgccjit.info -exec rm -f {} +
diff --git a/testing/libgccjit/checksums b/testing/libgccjit/checksums
deleted file mode 100644
index e0e463fe..00000000
--- a/testing/libgccjit/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf  gcc-11.1.0.tar.xz
-0485655dbccf9034ba1d2cf5fb2e7bdbfe10aee32906c9488c0ec3da69dbb44f  gccjit-musl-fix.patch
diff --git a/testing/libgccjit/depends b/testing/libgccjit/depends
deleted file mode 100644
index 7674b4f1..00000000
--- a/testing/libgccjit/depends
+++ /dev/null
@@ -1,7 +0,0 @@
-binutils
-byacc  make
-flex   make
-gmp
-libmpc
-mpfr
-zlib
diff --git a/testing/libgccjit/patches/gccjit-musl-fix.patch b/testing/libgccjit/patches/gccjit-musl-fix.patch
deleted file mode 100644
index d2ed1692..00000000
--- a/testing/libgccjit/patches/gccjit-musl-fix.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
-index 5bccf591a..35f5e35ef 100644
---- a/gcc/jit/jit-playback.c
-+++ b/gcc/jit/jit-playback.c
-@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
-+#include <pthread.h>
-+
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
-@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3.  If not see
- #include "diagnostic.h"
- #include "stmt.h"
- 
--#include <pthread.h>
--
- #include "jit-playback.h"
- #include "jit-result.h"
- #include "jit-builtins.h"
-diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
-index a237d574f..5785e3269 100644
---- a/gcc/jit/jit-recording.c
-+++ b/gcc/jit/jit-recording.c
-@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
-+#include <pthread.h>
-+
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
-@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
- #include "pretty-print.h"
- #include "toplev.h"
- 
--#include <pthread.h>
--
- #include "jit-builtins.h"
- #include "jit-recording.h"
- #include "jit-playback.h"
-diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
-index f9c33c63c..75f21d275 100644
---- a/gcc/jit/libgccjit.c
-+++ b/gcc/jit/libgccjit.c
-@@ -18,13 +18,13 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
-+#include <pthread.h>
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
- #include "timevar.h"
- #include "typed-splay-tree.h"
- #include "cppbuiltin.h"
--#include <pthread.h>
- 
- #include "libgccjit.h"
- #include "jit-recording.h"
diff --git a/testing/libgccjit/sources b/testing/libgccjit/sources
deleted file mode 100644
index 5c0ccc27..00000000
--- a/testing/libgccjit/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-https://gcc.gnu.org/pub/gcc/releases/gcc-11.1.0/gcc-11.1.0.tar.xz gcc
-patches/gccjit-musl-fix.patch
diff --git a/testing/libgccjit/version b/testing/libgccjit/version
deleted file mode 100644
index ec1ee9a6..00000000
--- a/testing/libgccjit/version
+++ /dev/null
@@ -1 +0,0 @@
-11.1.0 1
diff --git a/testing/libsoup3/build b/testing/libsoup3/build
new file mode 100755
index 00000000..dbf11245
--- /dev/null
+++ b/testing/libsoup3/build
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+export DESTDIR="$1"
+
+cl-meson \
+    -Dtls_check=false \
+    . output
+
+ninja -C output
+ninja -C output install
diff --git a/testing/libsoup3/checksums b/testing/libsoup3/checksums
new file mode 100644
index 00000000..a9d7ac16
--- /dev/null
+++ b/testing/libsoup3/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+6caf78bc467056dbe179abd16747f81da21a76bfe2442d8cf1d054f4965503aa  libsoup-3.4.3.tar.xz
diff --git a/testing/libsoup3/depends b/testing/libsoup3/depends
new file mode 100644
index 00000000..b43a5fa4
--- /dev/null
+++ b/testing/libsoup3/depends
@@ -0,0 +1,8 @@
+glib
+glib-networking
+libnghttp2
+libpsl
+libxml2
+meson make
+sqlite
+zlib
diff --git a/testing/libsoup3/meta b/testing/libsoup3/meta
new file mode 100644
index 00000000..ea8b80e0
--- /dev/null
+++ b/testing/libsoup3/meta
@@ -0,0 +1,3 @@
+description: HTTP library implementation
+license: LGPL-2.1-or-later
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/testing/libsoup3/sources b/testing/libsoup3/sources
new file mode 100644
index 00000000..0110f859
--- /dev/null
+++ b/testing/libsoup3/sources
@@ -0,0 +1 @@
+https://download.gnome.org/sources/libsoup/3.4/libsoup-3.4.3.tar.xz
diff --git a/testing/libsoup3/version b/testing/libsoup3/version
new file mode 100644
index 00000000..d7d7b2cb
--- /dev/null
+++ b/testing/libsoup3/version
@@ -0,0 +1 @@
+3.4.3 1