Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove debian dependency on libgcc-s1 (#158883)

Browse Source
This commit is contained in:
Robo
2022-08-24 02:06:12 +09:00
committed by GitHub
parent 0380d81838
commit 3933a69210
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/linux/debian/calculate-deps.js
View File

@@ -65,6 +65,15 @@ function calculatePackageDeps(binaryPath, arch, sysroot) {
depsStr = line.substring(shlibsDependsPrefix.length);
}
}
const requires = new Set(depsStr.split(', ').sort());
// Refs https://chromium-review.googlesource.com/c/chromium/src/+/3572926
// Chromium depends on libgcc_s, is from the package libgcc1. However, in
// Bullseye, the package was renamed to libgcc-s1. To avoid adding a dep
// on the newer package, this hack skips the dep. This is safe because
// libgcc-s1 is a dependency of libc6. This hack can be removed once
// support for Debian Buster and Ubuntu Bionic are dropped.
const filteredDeps = depsStr.split(', ').filter(dependency => {
return !dependency.startsWith('libgcc-s1');
}).sort();
const requires = new Set(filteredDeps);
return requires;
}

11
build/linux/debian/calculate-deps.ts
View File

@@ -70,6 +70,15 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, sysroo
depsStr = line.substring(shlibsDependsPrefix.length);
}
}
const requires = new Set(depsStr.split(', ').sort());
// Refs https://chromium-review.googlesource.com/c/chromium/src/+/3572926
// Chromium depends on libgcc_s, is from the package libgcc1. However, in
// Bullseye, the package was renamed to libgcc-s1. To avoid adding a dep
// on the newer package, this hack skips the dep. This is safe because
// libgcc-s1 is a dependency of libc6. This hack can be removed once
// support for Debian Buster and Ubuntu Bionic are dropped.
const filteredDeps = depsStr.split(', ').filter(dependency => {
return !dependency.startsWith('libgcc-s1');
}).sort();
const requires = new Set(filteredDeps);
return requires;
}

3
build/linux/debian/dep-lists.js
View File

@@ -36,7 +36,6 @@ exports.referenceGeneratedDepsByArch = {
'libdrm2 (>= 2.4.38)',
'libexpat1 (>= 2.0.1)',
'libgbm1 (>= 8.1~0)',
'libgcc-s1 (>= 3.0)',
'libglib2.0-0 (>= 2.16.0)',
'libglib2.0-0 (>= 2.39.4)',
'libgtk-3-0 (>= 3.9.10)',
@@ -73,8 +72,6 @@ exports.referenceGeneratedDepsByArch = {
'libdrm2 (>= 2.4.38)',
'libexpat1 (>= 2.0.1)',
'libgbm1 (>= 8.1~0)',
'libgcc-s1 (>= 3.0)',
'libgcc-s1 (>= 3.5)',
'libglib2.0-0 (>= 2.16.0)',
'libglib2.0-0 (>= 2.39.4)',
'libgtk-3-0 (>= 3.9.10)',

3
build/linux/debian/dep-lists.ts
View File

@@ -36,7 +36,6 @@ export const referenceGeneratedDepsByArch = {
'libdrm2 (>= 2.4.38)',
'libexpat1 (>= 2.0.1)',
'libgbm1 (>= 8.1~0)',
'libgcc-s1 (>= 3.0)',
'libglib2.0-0 (>= 2.16.0)',
'libglib2.0-0 (>= 2.39.4)',
'libgtk-3-0 (>= 3.9.10)',
@@ -73,8 +72,6 @@ export const referenceGeneratedDepsByArch = {
'libdrm2 (>= 2.4.38)',
'libexpat1 (>= 2.0.1)',
'libgbm1 (>= 8.1~0)',
'libgcc-s1 (>= 3.0)',
'libgcc-s1 (>= 3.5)',
'libglib2.0-0 (>= 2.16.0)',
'libglib2.0-0 (>= 2.39.4)',
'libgtk-3-0 (>= 3.9.10)',