[PATCH 4/4] sbuild-chroot: Pre-install also libcpp-*-dev and libstdc++-*-dev

[Jan Kiszka <jan.kiszka@siemens.com>]

From: Jan Kiszka <jan.kiszka@siemens.com>

Basically the same story as for libc6-dev: gcc and g++ pull those in for
the native case, but the cross-compilers will only pull the respective
dev-*-cross packages which do not help to fulfill build dependencies.

As those package names depend on the compiler version, introduce a new
distro configuration variable DISTRO_GCC. If it is set, it shall contain
the default gcc version number. If it is not set, the pre-installation
optimization is skipped by sbuild-chroot.

DISTRO_GCC is set for all in-tree distro versions except for sid as it
is too much of a moving target there.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/conf/distro/raspios-bullseye.conf    |  2 ++
 meta-isar/conf/distro/ubuntu-focal.conf        |  2 ++
 meta/conf/distro/debian-bookworm.conf          |  2 ++
 meta/conf/distro/debian-bullseye.conf          |  2 ++
 meta/conf/distro/debian-buster.conf            |  2 ++
 .../sbuild-chroot/sbuild-chroot.inc            | 18 ++++++++++++++++++
 6 files changed, 28 insertions(+)

diff --git a/meta-isar/conf/distro/raspios-bullseye.conf b/meta-isar/conf/distro/raspios-bullseye.conf
index 1f65c3cd..2ba2c75c 100644
--- a/meta-isar/conf/distro/raspios-bullseye.conf
+++ b/meta-isar/conf/distro/raspios-bullseye.conf
@@ -23,3 +23,5 @@ DISTRO_KERNELS ?= "kernel kernel7 kernel7l kernel8"
 THIRD_PARTY_APT_KEYS += "http://archive.raspberrypi.org/debian/raspberrypi.gpg.key;sha256sum=76603890d82a492175caf17aba68dc73acb1189c9fd58ec0c19145dfa3866d56"
 
 COMPAT_DISTRO_ARCH_arm64 = "armhf"
+
+DISTRO_GCC = "10"
diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
index 084f8e3d..eb7a1e80 100644
--- a/meta-isar/conf/distro/ubuntu-focal.conf
+++ b/meta-isar/conf/distro/ubuntu-focal.conf
@@ -26,3 +26,5 @@ IMAGE_PREINSTALL += "init"
 IMAGE_PREINSTALL += "initramfs-tools"
 
 WIC_IMAGER_INSTALL += "python3-distutils"
+
+DISTRO_GCC = "9"
diff --git a/meta/conf/distro/debian-bookworm.conf b/meta/conf/distro/debian-bookworm.conf
index 7e614bf2..d0599dc6 100644
--- a/meta/conf/distro/debian-bookworm.conf
+++ b/meta/conf/distro/debian-bookworm.conf
@@ -13,3 +13,5 @@ DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686-pae 686 alpha-generic alpha-smp \
 	mips64r6el octeon parisc parisc64 powerpc-smp powerpc powerpc64 \
 	powerpc64le riscv64 rpi rt-686-pae rt-amd64 rt-arm64 rt-armmp \
 	s390x sh7751r sh7785lcr sparc64-smp sparc64"
+
+DISTRO_GCC = "12"
diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/debian-bullseye.conf
index 9e072692..9b76e68a 100644
--- a/meta/conf/distro/debian-bullseye.conf
+++ b/meta/conf/distro/debian-bullseye.conf
@@ -10,3 +10,5 @@ DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
 DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
     armmp-lpae cloud-amd64 loongson-3 octeon powerpc64le rpi s390x marvell \
     rt-686-pae rt-amd64 rt-arm64 rt-armmp"
+
+DISTRO_GCC = "10"
diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf
index c882460a..025fc936 100644
--- a/meta/conf/distro/debian-buster.conf
+++ b/meta/conf/distro/debian-buster.conf
@@ -10,3 +10,5 @@ DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
 DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
     armmp-lpae cloud-amd64 loongson-3 marvell octeon powerpc64le rpi s390x \
     rt-686-pae rt-amd64 rt-arm64 rt-armmp"
+
+DISTRO_GCC = "8"
diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
index 08a2d55d..9336c0cc 100644
--- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
+++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
@@ -10,6 +10,24 @@ PV = "1.0"
 
 inherit rootfs
 
+python() {
+    distro_gcc = d.getVar('DISTRO_GCC')
+    distro_arch = d.getVar('DISTRO_ARCH')
+
+    if d.getVar('DISTRO_GCC'):
+        d.appendVar('SBUILD_CHROOT_PREINSTALL_COMMON',
+                    ' libgcc-{}-dev:{}'.format(distro_gcc, distro_arch))
+        d.appendVar('SBUILD_CHROOT_PREINSTALL_COMMON',
+                    ' libstdc++-{}-dev:{}'.format(distro_gcc, distro_arch))
+
+        if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1':
+            compat_arch = d.getVar('COMPAT_DISTRO_ARCH')
+            d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL',
+                        ' libgcc-{}-dev:{}'.format(distro_gcc, compat_arch))
+            d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL',
+                        ' libstdc++-{}-dev:{}'.format(distro_gcc, compat_arch))
+}
+
 SBUILD_CHROOT_COMPAT_PREINSTALL_compat-arch = " \
     libc6-dev:${COMPAT_DISTRO_ARCH} \
     crossbuild-essential-${COMPAT_DISTRO_ARCH}"
-- 
2.35.3