synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Oliver Smith 2022-10-05 20:29:53 +02:00
parent 550b9b3466
commit 54268b72e1
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pmb/build/_package.py
View File

@ -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