From b262609199338116ccf96ee1983b748a15179672 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Wed, 28 Sep 2022 08:32:46 +0200
Subject: [PATCH] pmb.aportgen.gcc: add subpkg libstdc++-dev-$arch

Add the subpackage, because g++-$arch depends on it since
12.1.1_git20220630-r6. This fix was already applied to pmaports, thanks
to ungeskriptet! Adjust the aportgen code to make sure this is added in
the future as well.

Related: pmaports MR 3464
Related: https://gitlab.alpinelinux.org/alpine/aports/-/commit/f1044b1dae5a8bde2b1e032a609dfe0ba86aa490
---
 pmb/aportgen/gcc.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pmb/aportgen/gcc.py b/pmb/aportgen/gcc.py
index 81af9d31..3464673c 100644
--- a/pmb/aportgen/gcc.py
+++ b/pmb/aportgen/gcc.py
@@ -34,7 +34,7 @@ def generate(args, pkgname):
                              " gmp-dev mpfr-dev mpc1-dev zlib-dev",
         "makedepends_host": "linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev"
                             f" zlib-dev musl-dev-{arch} binutils-{arch}",
-        "subpackages": f"g++-{arch}:gpp" if prefix == "gcc" else "",
+        "subpackages": "",
 
         # gcc6: options is already there, so we need to replace it and not only
         # set it below the header like done below.
@@ -46,6 +46,11 @@ def generate(args, pkgname):
         "LIBITM": "false",
     }
 
+    # Latest gcc only, not gcc4 and gcc6
+    if prefix == "gcc":
+        fields["subpackages"] = f"g++-{arch}:gpp" \
+                                f" libstdc++-dev-{arch}:libcxx_dev"
+
     below_header = "CTARGET_ARCH=" + arch + """
         CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
         LANG_D=false