From 582122cc935808ed77571f8894ef4139adda6a7f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 1 Dec 2023 12:26:49 +0530 Subject: [PATCH] Bump the glibc version needed on linux Qt WebEngine 6.6 needs to be built with gcc that has -stdc++20 which means we need to move to a ubuntu jammy image. The good part is this harmonises ARM and Intel builds to both use jammy. The bad part is the binaries now wont run on any distro released more than about a year ago. Sigh. --- bypy/linux.conf | 2 +- setup/linux-installer.py | 3 ++- setup/linux-installer.sh | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bypy/linux.conf b/bypy/linux.conf index 57cb3a4691..34e233c476 100644 --- a/bypy/linux.conf +++ b/bypy/linux.conf @@ -1,4 +1,4 @@ -image 'https://cloud-images.ubuntu.com/releases/focal/release/ubuntu-20.04-server-cloudimg-{}.img' +image 'https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-{}.img' # Build time deps for Qt. See https://doc.qt.io/qt-6/linux-requirements.html and # https://doc.qt.io/qt-6/qtwebengine-platform-notes.html diff --git a/setup/linux-installer.py b/setup/linux-installer.py index e4aace9120..7e1eb1b00e 100644 --- a/setup/linux-installer.py +++ b/setup/linux-installer.py @@ -805,7 +805,8 @@ def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_ ' available for 64-bit systems. You will have to compile from' ' source.') glibc_versions = { - (6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'} + (6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'}, + (7, 2, 0) : {'min_required': (2, 34), 'release_date': '2022-02-03'}, } if is_linux_arm64: glibc_versions.update({ diff --git a/setup/linux-installer.sh b/setup/linux-installer.sh index cc5ff6a86c..ceb1e107fc 100644 --- a/setup/linux-installer.sh +++ b/setup/linux-installer.sh @@ -854,7 +854,8 @@ def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_ ' available for 64-bit systems. You will have to compile from' ' source.') glibc_versions = { - (6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'} + (6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'}, + (7, 2, 0) : {'min_required': (2, 34), 'release_date': '2022-02-03'}, } if is_linux_arm64: glibc_versions.update({