From 7f5c87e5ddeb76d666147b1fdaf452df42774005 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 13 Jun 2023 18:14:35 +0200 Subject: [PATCH] Remove workaround for gcc with !tracedeps Get rid of a workaround that isn't needed anymore. Also this makes use of the get_gcc_version() function that is otherwise only needed for the long obsolete distcc code, which I'm about to remove in the next patch. Reviewed-by: Luca Weiss Reviewed-by: Clayton Craft Link: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/%3C20230613161437.570196-2-ollieparanoid@postmarketos.org%3E --- pmb/build/_package.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pmb/build/_package.py b/pmb/build/_package.py index 79c6a1a9..e800ca33 100644 --- a/pmb/build/_package.py +++ b/pmb/build/_package.py @@ -227,14 +227,6 @@ 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-r3": - pmb.chroot.apk.install(args, ["isl25"], build=False) return True