From d447544e63f31ae8c606075251eacebee1fcf4c4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 8 Dec 2023 09:10:12 +0530 Subject: [PATCH] Revert "Bump the glibc version needed on linux" This reverts commit 582122cc935808ed77571f8894ef4139adda6a7f. Since we are going back to Qt 6.5 we dont need to build with newer gcc --- bypy/linux.conf | 2 +- setup/linux-installer.py | 3 +-- setup/linux-installer.sh | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bypy/linux.conf b/bypy/linux.conf index 34e233c476..57cb3a4691 100644 --- a/bypy/linux.conf +++ b/bypy/linux.conf @@ -1,4 +1,4 @@ -image 'https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-{}.img' +image 'https://cloud-images.ubuntu.com/releases/focal/release/ubuntu-20.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 7e1eb1b00e..e4aace9120 100644 --- a/setup/linux-installer.py +++ b/setup/linux-installer.py @@ -805,8 +805,7 @@ 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'}, - (7, 2, 0) : {'min_required': (2, 34), 'release_date': '2022-02-03'}, + (6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'} } if is_linux_arm64: glibc_versions.update({ diff --git a/setup/linux-installer.sh b/setup/linux-installer.sh index ceb1e107fc..cc5ff6a86c 100644 --- a/setup/linux-installer.sh +++ b/setup/linux-installer.sh @@ -854,8 +854,7 @@ 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'}, - (7, 2, 0) : {'min_required': (2, 34), 'release_date': '2022-02-03'}, + (6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'} } if is_linux_arm64: glibc_versions.update({