Fix arm64 build requiring glibc 2.29

https://bugs.chromium.org/p/chromium/issues/detail?id=1309965#c5
klzgrad · Oct 5, 2022 · 077d788 · 077d788
1 parent 2a96855
commit 077d788
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -124,7 +124,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: src/out/sysroot-build/bullseye/bullseye_*
-          key: sysroot-linux-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+          key: sysroot-linux-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-fixbugrefresh-v${{ env.CACHE_EPOCH }}
       - id: ccache-timestamp
         run: echo "::set-output name=date::$(date +%s)"
       - name: Cache ccache files

diff --git a/src/build/linux/sysroot_scripts/reversion_glibc.py b/src/build/linux/sysroot_scripts/reversion_glibc.py
@@ -71,7 +71,7 @@
       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
@@ -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() {