From a28c58a7043638418be522cfc86700e45336335a Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 18 Mar 2021 13:41:12 +0100 Subject: [PATCH] cross/binutils-*: fix build aportgen generates this incorrectly, we don't want any subpackages for these cross packages... --- cross/binutils-aarch64/APKBUILD | 4 ---- cross/binutils-armhf/APKBUILD | 4 ---- cross/binutils-armv7/APKBUILD | 4 ---- 3 files changed, 12 deletions(-) diff --git a/cross/binutils-aarch64/APKBUILD b/cross/binutils-aarch64/APKBUILD index 2a0434a78..e64876f06 100644 --- a/cross/binutils-aarch64/APKBUILD +++ b/cross/binutils-aarch64/APKBUILD @@ -18,10 +18,6 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz " builddir="$srcdir/binutils-$pkgver" -if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then - subpackages="$subpackages binutils-gold" -fi - if [ "$CHOST" != "$CTARGET" ]; then pkgname="binutils-$CTARGET_ARCH" subpackages="" diff --git a/cross/binutils-armhf/APKBUILD b/cross/binutils-armhf/APKBUILD index ac539a77d..ca00b2862 100644 --- a/cross/binutils-armhf/APKBUILD +++ b/cross/binutils-armhf/APKBUILD @@ -18,10 +18,6 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz " builddir="$srcdir/binutils-$pkgver" -if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then - subpackages="$subpackages binutils-gold" -fi - if [ "$CHOST" != "$CTARGET" ]; then pkgname="binutils-$CTARGET_ARCH" subpackages="" diff --git a/cross/binutils-armv7/APKBUILD b/cross/binutils-armv7/APKBUILD index 78e573780..b49b26dda 100644 --- a/cross/binutils-armv7/APKBUILD +++ b/cross/binutils-armv7/APKBUILD @@ -18,10 +18,6 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz " builddir="$srcdir/binutils-$pkgver" -if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then - subpackages="$subpackages binutils-gold" -fi - if [ "$CHOST" != "$CTARGET" ]; then pkgname="binutils-$CTARGET_ARCH" subpackages=""