From 1a16a881a5ca0296cf5d03f3eab2a5ddcbd9dcf3 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Thu, 6 Oct 2022 00:14:04 +0800 Subject: [PATCH] sysroot: Fix arm64 build requiring glibc 2.29 https://bugs.chromium.org/p/chromium/issues/detail?id=1309965#c5 --- src/build/linux/sysroot_scripts/reversion_glibc.py | 2 +- src/build/linux/sysroot_scripts/sysroot-creator.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build/linux/sysroot_scripts/reversion_glibc.py b/src/build/linux/sysroot_scripts/reversion_glibc.py index 61d5a63428..c0330cc37e 100755 --- a/src/build/linux/sysroot_scripts/reversion_glibc.py +++ b/src/build/linux/sysroot_scripts/reversion_glibc.py @@ -71,7 +71,7 @@ for line in stdout.decode("utf-8").split('\n'): continue version = [int(part) for part in match.group(1).split('.')] - if version < MAX_ALLOWED_GLIBC_VERSION: + if version <= MAX_ALLOWED_GLIBC_VERSION: old_supported_version = supported_version.get(base_name, ([-1], -1)) supported_version[base_name] = max((version, index), old_supported_version) if is_default: diff --git a/src/build/linux/sysroot_scripts/sysroot-creator.sh b/src/build/linux/sysroot_scripts/sysroot-creator.sh index 39eab9a509..07638ec79a 100644 --- a/src/build/linux/sysroot_scripts/sysroot-creator.sh +++ b/src/build/linux/sysroot_scripts/sysroot-creator.sh @@ -427,7 +427,7 @@ HacksAndPatchesARM64() { HacksAndPatchesCommon aarch64 linux-gnu true # Skip reversion_glibc.py. Glibc is compiled in a way where many libm math # functions do not have compatibility symbols for versions <= 2.17. - # ReversionGlibc aarch64 linux-gnu + ReversionGlibc aarch64 linux-gnu } HacksAndPatchesARMEL() {