From 21d29cabd99e7ff6534d2e99601cbd77abf30f8a Mon Sep 17 00:00:00 2001 From: ptrcnull <git@ptrcnull.me> Date: Wed, 22 May 2024 10:13:36 +0200 Subject: [PATCH] main/*: remove stale mips references --- main/czmq/APKBUILD | 5 ----- main/efi-mkkeys/APKBUILD | 2 +- main/efitools/APKBUILD | 2 +- main/gd/APKBUILD | 2 +- main/gnu-efi/APKBUILD | 2 +- main/libseccomp/APKBUILD | 4 ---- main/libsndfile/APKBUILD | 1 - main/linux-lts/APKBUILD | 1 - main/mariadb/APKBUILD | 2 +- main/nginx/APKBUILD | 7 ------- main/pcre/APKBUILD | 2 -- main/radvd/APKBUILD | 5 ----- main/u-boot/APKBUILD | 2 +- main/xtables-addons-lts/APKBUILD | 2 +- 14 files changed, 7 insertions(+), 32 deletions(-) diff --git a/main/czmq/APKBUILD b/main/czmq/APKBUILD index 7ee9be018463..b7ed1e70abd4 100644 --- a/main/czmq/APKBUILD +++ b/main/czmq/APKBUILD @@ -11,11 +11,6 @@ makedepends="util-linux-dev zeromq-dev cmake samurai" subpackages="$pkgname-static $pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/zeromq/czmq/archive/v$pkgver.tar.gz" -case "$CARCH" in -# crypto tests assume MIPS is little-endian - mips*) options="!check";; -esac - build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" diff --git a/main/efi-mkkeys/APKBUILD b/main/efi-mkkeys/APKBUILD index a031c0a03297..b4e5462c104f 100644 --- a/main/efi-mkkeys/APKBUILD +++ b/main/efi-mkkeys/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.1.0 pkgrel=0 pkgdesc="Script to easily generate self-signed UEFI keys for Secure Boot" url="https://github.com/jirutka/efi-mkkeys" -arch="noarch !armhf !s390x !ppc64le !mips !mips64 !riscv64 !loongarch64" # limited by efitools +arch="noarch !armhf !s390x !ppc64le !riscv64 !loongarch64" # limited by efitools license="MIT" depends="efitools cmd:openssl cmd:uuidgen" source="https://github.com/jirutka/efi-mkkeys/archive/v$pkgver/efi-mkkeys-$pkgver.tar.gz" diff --git a/main/efitools/APKBUILD b/main/efitools/APKBUILD index e50988490f65..69eb62c5972b 100644 --- a/main/efitools/APKBUILD +++ b/main/efitools/APKBUILD @@ -8,7 +8,7 @@ pkgdesc="EFI tools" url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git" # riscv64: fails to build # others: limited by sbsigntool -arch="all !armhf !s390x !ppc64le !mips !mips64 !riscv64 !loongarch64" +arch="all !armhf !s390x !ppc64le !riscv64 !loongarch64" license="(GPL-2.0-only AND LGPL-2.1-or-later) WITH OpenSSL-Exception" options="!check" # no testsuite # efi-readvar requires mount(8) with -l option diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD index 273e37c2372a..7688c6a4aa21 100644 --- a/main/gd/APKBUILD +++ b/main/gd/APKBUILD @@ -27,7 +27,7 @@ builddir="$srcdir/$_pkgreal-$pkgver" case "$CARCH" in # https://github.com/libgd/libgd/issues/359 - aarch64|mips*|ppc64le|riscv64|s390x|x86|loongarch64) options="!check";; + aarch64|ppc64le|riscv64|s390x|x86|loongarch64) options="!check";; esac # secfixes: diff --git a/main/gnu-efi/APKBUILD b/main/gnu-efi/APKBUILD index 7f6f6ac2cded..609b69399162 100644 --- a/main/gnu-efi/APKBUILD +++ b/main/gnu-efi/APKBUILD @@ -4,7 +4,7 @@ pkgver=3.0.15 pkgrel=4 pkgdesc="Development Libraries and headers for EFI" url="https://sourceforge.net/projects/gnu-efi/" -arch="all !armhf !s390x !ppc64le !mips !mips64 !loongarch64" +arch="all !armhf !s390x !ppc64le !loongarch64" license="BSD-2-Clause" subpackages="$pkgname-dev" depends_dev="$pkgname" diff --git a/main/libseccomp/APKBUILD b/main/libseccomp/APKBUILD index 43b39a4549a7..5a17b9e8bbed 100644 --- a/main/libseccomp/APKBUILD +++ b/main/libseccomp/APKBUILD @@ -16,10 +16,6 @@ source="https://github.com/seccomp/libseccomp/releases/download/v$pkgver/libsecc remove-redefinition-prctl.patch " -case "$CARCH" in - mips*) options="$options !check";; -esac - # secfixes: # 2.4.0-r0: # - CVE-2019-9893 diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD index a3d4cd3a6217..a6137756d23d 100644 --- a/main/libsndfile/APKBUILD +++ b/main/libsndfile/APKBUILD @@ -29,7 +29,6 @@ source="https://github.com/libsndfile/libsndfile/releases/download/$pkgver/libsn case $CARCH in arm*) options="!check" ;; # sporadic testsuite failures s390x*) options="!check" ;; # broken opus support -mips*) options="!check" ;; # takes way too long esac # secfixes: diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD index 023300732d45..58dce97b70ff 100644 --- a/main/linux-lts/APKBUILD +++ b/main/linux-lts/APKBUILD @@ -90,7 +90,6 @@ _kernelarch() { case "$arch" in aarch64*) arch="arm64" ;; arm*) arch="arm" ;; - mips*) arch="mips" ;; ppc*) arch="powerpc" ;; s390*) arch="s390" ;; riscv*) arch="riscv" ;; diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 9cd5a8b226a8..8be8fbdd4725 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -71,7 +71,7 @@ subpackages=" options="suid" case "$CARCH" in - x86|s390x|mips64) _enable_rocksdb=NO ;; + x86|s390x) _enable_rocksdb=NO ;; *) _enable_rocksdb=YES subpackages="$subpackages $pkgname-plugin-rocksdb:_plugin_rocksdb" diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD index b4845f5b29e7..9497da2f5f6c 100644 --- a/main/nginx/APKBUILD +++ b/main/nginx/APKBUILD @@ -369,13 +369,6 @@ check() { msg "Running nginx tests..." cd "$srcdir"/nginx-tests-* - case "$CARCH" in - mips*) - # Sporadic failure on builder. - rm ssl.t - ;; - esac - : ${JOBS:-1} TEST_NGINX_BINARY="$builddir/objs/nginx" prove -j $((JOBS > 20 ? 20 : JOBS)) . diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD index eb90e3abcf0f..bf9af2b6aa0a 100644 --- a/main/pcre/APKBUILD +++ b/main/pcre/APKBUILD @@ -38,8 +38,6 @@ prepare() { build() { local _enable_jit="--enable-jit" case "$CARCH" in - mips64*) export CPPFLAGS="$CPPFLAGS -DSLJIT_IS_FPU_AVAILABLE=0";; - mips*) export CPPFLAGS="$CPPFLAGS -DSLJIT_IS_FPU_AVAILABLE=0 -DSLJIT_MIPS_R1=1";; s390x) _enable_jit="";; riscv*) _enable_jit="";; loongarch64) _enable_jit="";; diff --git a/main/radvd/APKBUILD b/main/radvd/APKBUILD index d8b40d390d17..acc8802d74b9 100644 --- a/main/radvd/APKBUILD +++ b/main/radvd/APKBUILD @@ -16,11 +16,6 @@ source="http://www.litech.org/radvd/dist/radvd-$pkgver.tar.xz fix-alpine-plz.patch " -# test failure on builders due to kernel issue -case "$CARCH" in -mips*) options="!check";; -esac - prepare() { default_prepare update_config_sub diff --git a/main/u-boot/APKBUILD b/main/u-boot/APKBUILD index f49183a662cf..84e0dfb7a9e8 100644 --- a/main/u-boot/APKBUILD +++ b/main/u-boot/APKBUILD @@ -119,7 +119,7 @@ build() { package() { case "$CARCH" in - mips64|x86*) return;; + x86*) return;; esac cd "$builddir"/build mkdir -p "$pkgdir"/usr/share/$pkgname "$pkgdir"/usr/sbin diff --git a/main/xtables-addons-lts/APKBUILD b/main/xtables-addons-lts/APKBUILD index 2b298605470e..4bb6dd1d70e9 100644 --- a/main/xtables-addons-lts/APKBUILD +++ b/main/xtables-addons-lts/APKBUILD @@ -19,7 +19,7 @@ pkgrel=$(( _krel + _rel )) pkgdesc="Iptables extensions kernel modules" url="https://inai.de/projects/xtables-addons/" -arch="all !armhf !mips64 !riscv64" +arch="all !armhf !riscv64" license="GPL-2.0-or-later" depends="$_kpkg=$_kpkgver" makedepends="$_kpkg-dev=$_kpkgver iptables-dev linux-headers" -- GitLab