timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-24 03:50:13 +10:00
Code Issues Packages Projects Releases Wiki Activity

chore(linux-reh-x86): streamline to only necessary* changes (#2471)

Browse Source
This commit is contained in:
Baptiste Augrain
2025-08-18 14:49:58 +02:00
committed by GitHub
parent a3bf4232ba
commit 914f0da189
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/insider-linux.yml vendored
View File

@@ -331,16 +331,17 @@ jobs:
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version-file: '.nvmrc' node-version-file: '.nvmrc'
if: env.DISABLED != 'yes' && matrix.npm_arch != 'x64' if: env.DISABLED != 'yes'
# if: env.DISABLED != 'yes' && matrix.npm_arch != 'x64'
- name: Install unofficial Node.js # - name: Install unofficial Node.js
run: ./build/linux/install_nodejs.sh # run: ./build/linux/install_nodejs.sh
env: # env:
NODEJS_ARCH: ${{ matrix.npm_arch }} # NODEJS_ARCH: ${{ matrix.npm_arch }}
NODEJS_SITE: https://unofficial-builds.nodejs.org # NODEJS_SITE: https://unofficial-builds.nodejs.org
NODEJS_URLROOT: /download/release # NODEJS_URLROOT: /download/release
NODEJS_URLSUFFIX: -glibc-217 # NODEJS_URLSUFFIX: -glibc-217
if: env.DISABLED != 'yes' && matrix.npm_arch == 'x64' # if: env.DISABLED != 'yes' && matrix.npm_arch == 'x64'
- name: Setup Python 3 - name: Setup Python 3
uses: actions/setup-python@v5 uses: actions/setup-python@v5

2
build/linux/package_reh.sh
View File

@@ -200,7 +200,7 @@ if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
if [[ -n "${VERIFY_CX11}" ]]; then if [[ -n "${VERIFY_CXX11}" ]]; then
SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ../build/linux/verify_cxx11_requirements.sh SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ../build/linux/verify_cxx11_requirements.sh
fi fi

2
build/linux/verify_cxx11_requirements.sh
View File

@@ -8,7 +8,7 @@ echo "Verifying requirements for files: ${FILES}"
for FILE in ${FILES}; do for FILE in ${FILES}; do
if [[ -n "$( strings "${FILE}" | grep cxx11 | tail -n1 )" ]]; then if [[ -n "$( strings "${FILE}" | grep cxx11 | tail -n1 )" ]]; then
echo "Error: File ${FILE} has dependency on ABI ${CXXABI_VERSION} > ${EXPECTED_CXXABI_VERSION}" echo "Error: File ${FILE} has dependency on CXX11"
exit 1 exit 1
fi fi
done done

5
patches/linux/arch-0-support.patch
View File

@@ -12,11 +12,6 @@ index 6805633..9d4b59f 100755
- SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_REMOTE_SYSROOT_DIR" VSCODE_SYSROOT_PREFIX="-glibc-2.28-gcc-8.5.0" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()' - SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_REMOTE_SYSROOT_DIR" VSCODE_SYSROOT_PREFIX="-glibc-2.28-gcc-8.5.0" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
+ SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_REMOTE_SYSROOT_DIR" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()' + SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_REMOTE_SYSROOT_DIR" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
fi fi
@@ -50,3 +50,3 @@ if [ "$npm_config_arch" == "x64" ]; then
export VSCODE_REMOTE_CXX=$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-g++
- export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
+ export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -D_GLIBCXX_USE_CXX11_ABI=0"
export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -L$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu"
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index 10b7b44..0ad7550 100644 index 10b7b44..0ad7550 100644
--- a/build/gulpfile.reh.js --- a/build/gulpfile.reh.js