From f41659d4aeece467cd1fddba986dfefd84d75215 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 16 Oct 2022 17:58:43 +0200 Subject: [PATCH] pmb.build._package: update isl workaround (MR 2213) The plan was to drop this workaround, once alpine releases a new gcc version, and we regenerate our cross compilers against that version _and_ drop options="!tracedeps", as latest pmbootstrap aportgen would do. However !tracedeps wasn't dropped in the latest upgrade. This was too easy to miss, I'll add a comment to the gcc-cross APKBUILDs so we see it next time. Let's just update the workaround for this version. --- pmb/build/_package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmb/build/_package.py b/pmb/build/_package.py index b2ccd6f9..d2b8ae4a 100644 --- a/pmb/build/_package.py +++ b/pmb/build/_package.py @@ -233,7 +233,7 @@ def init_buildenv(args, apkbuild, arch, strict=False, force=False, cross=None, # 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": + if get_gcc_version(args, arch) == "12.2.1_git20220924-r3": pmb.chroot.apk.install(args, ["isl25"], build=False) return True