mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-28 00:06:09 +03:00
Code Issues Projects Releases Wiki Activity

Fix arm64 build requiring glibc 2.29

Browse Source 
https://bugs.chromium.org/p/chromium/issues/detail?id=1309965#c5
This commit is contained in:
klzgrad 2022-10-06 00:14:04 +08:00
parent 2a968556c4
commit 077d788a4a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -124,7 +124,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: src/out/sysroot-build/bullseye/bullseye_* 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 - id: ccache-timestamp
run: echo "::set-output name=date::$(date +%s)" run: echo "::set-output name=date::$(date +%s)"
- name: Cache ccache files - name: Cache ccache files

2
src/build/linux/sysroot_scripts/reversion_glibc.py
View File

@ -71,7 +71,7 @@ for line in stdout.decode("utf-8").split('\n'):
continue continue
version = [int(part) for part in match.group(1).split('.')] 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)) old_supported_version = supported_version.get(base_name, ([-1], -1))
supported_version[base_name] = max((version, index), old_supported_version) supported_version[base_name] = max((version, index), old_supported_version)
if is_default: if is_default:

2
src/build/linux/sysroot_scripts/sysroot-creator.sh
View File

@ -427,7 +427,7 @@ HacksAndPatchesARM64() {
HacksAndPatchesCommon aarch64 linux-gnu true HacksAndPatchesCommon aarch64 linux-gnu true
# Skip reversion_glibc.py. Glibc is compiled in a way where many libm math # Skip reversion_glibc.py. Glibc is compiled in a way where many libm math
# functions do not have compatibility symbols for versions <= 2.17. # functions do not have compatibility symbols for versions <= 2.17.
# ReversionGlibc aarch64 linux-gnu ReversionGlibc aarch64 linux-gnu
} }
HacksAndPatchesARMEL() { HacksAndPatchesARMEL() {