From 54268b72e10262b67d32cd70d40ca01791a9d835 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 5 Oct 2022 20:29:53 +0200 Subject: [PATCH] pmb.build.package: add workaround for missing isl Install isl25 for the specific gcc versions we currently have in pmaports master that are missing it; this is easier than building new packages and going out of sync with Alpine's versioning. This can be reverted as soon as there is a newer gcc. Related: pmaports issue 1732 --- pmb/build/_package.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pmb/build/_package.py b/pmb/build/_package.py index dd719385..b2ccd6f9 100644 --- a/pmb/build/_package.py +++ b/pmb/build/_package.py @@ -227,6 +227,14 @@ def init_buildenv(args, apkbuild, arch, strict=False, force=False, cross=None, pmb.chroot.distccd.start(args, arch) if cross == "crossdirect": pmb.chroot.mount_native_into_foreign(args, suffix) + # Workaround: this specific version currently in pmaports.git master + # was built with !tracedeps, so it doesn't pull in the isl dependency + # and we need to install it manually. Doing this is easier than bumping + # the pkgrel and going out of sync with Alpine's gcc package. This + # workaround can be removed once a newer gcc is in Alpine and we + # rebuild our cross gcc based on the new APKBUILD. See pmaports#1732. + if get_gcc_version(args, arch) == "12.2.1_git20220924-r2": + pmb.chroot.apk.install(args, ["isl25"], build=False) return True