From 4786516a22cab4f54c9a638b1171810e8701326a Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@bitmessage.ch>
Date: Sat, 22 Jul 2017 12:36:00 +0200
Subject: [PATCH] Fix #219 for real!

100% tested. Assuming that you don't need to test an obvious change,
because it only changes one line is dangerous. I will learn from this,
sorry for the inconvenience.

`gcc-armhf` compiles fine again with that change, and it is able to
cross-compile packages as it used to.
---
 aports/gcc-aarch64/APKBUILD | 3 +--
 aports/gcc-armhf/APKBUILD   | 3 +--
 pmb/aportgen/gcc.py         | 9 +++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/aports/gcc-aarch64/APKBUILD b/aports/gcc-aarch64/APKBUILD
index 4a8da487..3c03c491 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="g++-aarch64"
+subpackages="g++-aarch64:gpp"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
 replaces="libstdc++ binutils"
 
@@ -129,7 +129,6 @@ fi
 
 _languages=c
 if $LANG_CXX; then
-       subpackages="$subpackages g++$_target:gpp"
 	_languages="$_languages,c++"
 fi
 if $LANG_OBJC; then
diff --git a/aports/gcc-armhf/APKBUILD b/aports/gcc-armhf/APKBUILD
index e7b9b4b3..7f63fc08 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="g++-armhf"
+subpackages="g++-armhf:gpp"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
 replaces="libstdc++ binutils"
 
@@ -129,7 +129,6 @@ fi
 
 _languages=c
 if $LANG_CXX; then
-       subpackages="$subpackages g++$_target:gpp"
 	_languages="$_languages,c++"
 fi
 if $LANG_OBJC; then
diff --git a/pmb/aportgen/gcc.py b/pmb/aportgen/gcc.py
index db857e21..2ade84fe 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": "g++-" + arch,
+        "subpackages": "g++-" + arch + ":gpp",
 
         "LIBGOMP": "false",
         "LIBGCC": "false",
@@ -54,9 +54,10 @@ def generate(args, pkgname):
     """
 
     replace_simple = {
-        # Do not package libstdc++
-        '*subpackages="$subpackages libstdc++:libcxx:*':
-            '       subpackages="$subpackages g++$_target:gpp"',
+        # Do not package libstdc++, do not add "g++-$ARCH" here (already
+        # did that explicitly in the subpackages variable above, so
+        # pmbootstrap picks it up properly).
+        '*subpackages="$subpackages libstdc++:libcxx:*': None
     }
 
     pmb.aportgen.core.rewrite(