From 9e5683f151fe0839408cc3e18b5a1dfbe696a5fe Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sat, 22 Jul 2017 09:49:24 +0200 Subject: [PATCH] Fix #219: pmbootstrap could not find g++-armhf/g++-aarch64 --- aports/gcc-aarch64/APKBUILD | 2 +- aports/gcc-armhf/APKBUILD | 2 +- pmb/aportgen/gcc.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aports/gcc-aarch64/APKBUILD b/aports/gcc-aarch64/APKBUILD index 47fb0f2d..4a8da487 100644 --- a/aports/gcc-aarch64/APKBUILD +++ b/aports/gcc-aarch64/APKBUILD @@ -28,7 +28,7 @@ _gccrel=$pkgver-r$pkgrel depends="isl binutils-aarch64" makedepends_build="gcc g++ paxmark 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-aarch64 binutils-aarch64" -subpackages="" +subpackages="g++-aarch64" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target" replaces="libstdc++ binutils" diff --git a/aports/gcc-armhf/APKBUILD b/aports/gcc-armhf/APKBUILD index af4f8d0b..e7b9b4b3 100644 --- a/aports/gcc-armhf/APKBUILD +++ b/aports/gcc-armhf/APKBUILD @@ -28,7 +28,7 @@ _gccrel=$pkgver-r$pkgrel depends="isl binutils-armhf" makedepends_build="gcc g++ paxmark 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="" +subpackages="g++-armhf" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target" replaces="libstdc++ binutils" diff --git a/pmb/aportgen/gcc.py b/pmb/aportgen/gcc.py index b2433ec0..e9841881 100644 --- a/pmb/aportgen/gcc.py +++ b/pmb/aportgen/gcc.py @@ -34,7 +34,7 @@ def generate(args, pkgname): "depends": "isl binutils-" + arch, "makedepends_build": "gcc g++ paxmark 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-" + arch + " binutils-" + arch, - "subpackages": "", + "subpackages": "g++-"+arch, "LIBGOMP": "false", "LIBGCC": "false",