From 4c7d2459f5e4d596b56f48886fd8c60e52d4b296 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 11 Sep 2022 14:28:20 +0200 Subject: [PATCH] pmb.aportgen.gcc: remove isl from depends (MR 2203) Remove it from depends, as the package has been removed in Alpine and since quite some time we shouldn't have depended on it anyway. Related: issue 2167 --- pmb/aportgen/gcc.py | 2 +- test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pmb/aportgen/gcc.py b/pmb/aportgen/gcc.py index 20aca263..016bed3b 100644 --- a/pmb/aportgen/gcc.py +++ b/pmb/aportgen/gcc.py @@ -29,7 +29,7 @@ def generate(args, pkgname): "pkgname": pkgname, "pkgdesc": f"Stage2 cross-compiler for {arch}", "arch": pmb.config.arch_native, - "depends": f"isl binutils-{arch} mpc1", + "depends": f"binutils-{arch} mpc1", "makedepends_build": "gcc g++ bison flex texinfo gawk zip" " gmp-dev mpfr-dev mpc1-dev zlib-dev", "makedepends_host": "linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev" diff --git a/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD b/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD index 9ea038af..5afd624f 100644 --- a/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD +++ b/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD @@ -37,7 +37,7 @@ url="https://gcc.gnu.org" arch="x86_64" license="GPL-2.0-or-later LGPL-2.1-or-later" _gccrel=$pkgver-r$pkgrel -depends="isl binutils-armhf mpc1" +depends="binutils-armhf mpc1" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf" subpackages="g++-armhf:gpp"