Skip to content

Commit 641386d

Browse files
committed
Use a newer toolchain to build Linux binaries
Qt 6.7.2 fails to build with gcc 9/glibc 2.31
1 parent 5ec3263 commit 641386d

3 files changed

Lines changed: 13 additions & 10 deletions

File tree

bypy/linux.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image 'https://cloud-images.ubuntu.com/releases/focal/release/ubuntu-20.04-server-cloudimg-{}.img'
1+
image 'https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-{}.img'
22

33
# Build time deps for Qt. See https://doc.qt.io/qt-6/linux-requirements.html and
44
# https://doc.qt.io/qt-6/qtwebengine-platform-notes.html

setup/linux-installer.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,11 +806,12 @@ def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_
806806
' available for 64-bit systems. You will have to compile from'
807807
' source.')
808808
glibc_versions = {
809-
(6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'}
809+
(6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'},
810+
(7, 17, 0) : {'min_required': (2, 35), 'release_date': '2022-02-03'}
810811
}
811812
if is_linux_arm64:
812813
glibc_versions.update({
813-
(6, 8, 0) : {'min_required': (2, 34), 'release_date': '2022-02-03'}
814+
(6, 8, 0) : {'min_required': (2, 34), 'release_date': '2021-08-02'}
814815
})
815816
q = tuple(map(int, version.split('.'))) if version else (sys.maxsize, 999, 999)
816817
for key in sorted(glibc_versions, reverse=True):

setup/linux-installer.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,18 @@ if machine.startswith('arm') or machine.startswith('aarch64'):
8686
if py3:
8787
unicode = str
8888
raw_input = input
89-
from urllib.parse import urlparse
90-
from urllib.request import BaseHandler, build_opener, Request, urlopen, getproxies, addinfourl
9189
import http.client as httplib
90+
from urllib.parse import urlparse
91+
from urllib.request import BaseHandler, Request, addinfourl, build_opener, getproxies, urlopen
9292
def encode_for_subprocess(x):
9393
return x
9494
else:
95+
from urllib import addinfourl, getproxies, urlopen
96+
97+
import httplib
9598
from future_builtins import map
99+
from urllib2 import BaseHandler, Request, build_opener
96100
from urlparse import urlparse
97-
from urllib import urlopen, getproxies, addinfourl
98-
from urllib2 import BaseHandler, build_opener, Request
99-
import httplib
100101
101102
def encode_for_subprocess(x):
102103
if isinstance(x, unicode):
@@ -854,11 +855,12 @@ def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_
854855
' available for 64-bit systems. You will have to compile from'
855856
' source.')
856857
glibc_versions = {
857-
(6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'}
858+
(6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'},
859+
(7, 17, 0) : {'min_required': (2, 35), 'release_date': '2022-02-03'}
858860
}
859861
if is_linux_arm64:
860862
glibc_versions.update({
861-
(6, 8, 0) : {'min_required': (2, 34), 'release_date': '2022-02-03'}
863+
(6, 8, 0) : {'min_required': (2, 34), 'release_date': '2021-08-02'}
862864
})
863865
q = tuple(map(int, version.split('.'))) if version else (sys.maxsize, 999, 999)
864866
for key in sorted(glibc_versions, reverse=True):

0 commit comments

Comments
 (0)