From d5936f360f4b2d98a69f6071cfaa608b5853c0f0 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 17 Dec 2024 20:14:54 +0900 Subject: [PATCH] [CI] Upgrade build sysroot to Debian buster --- CI/docker.py | 4 ++-- CI/tools.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CI/docker.py b/CI/docker.py index f0f97d5fc..0097153d4 100644 --- a/CI/docker.py +++ b/CI/docker.py @@ -115,8 +115,8 @@ def sources_list(snapshot, sections): " --architecture=$arch" " --mode=chrootless" " --variant=extract" - " --include=libc6-dev,libcurl4-gnutls-dev,zlib1g-dev,libgcc-6-dev" - " stretch sysroot-$arch" + " --include=libc6-dev,libcurl4-gnutls-dev,zlib1g-dev,libgcc-8-dev" + " buster sysroot-$arch" " http://archive.debian.org/debian/ ;" " LD_PRELOAD=libfakechroot.so FAKECHROOT_BASE=$PWD/sysroot-$arch" " symlinks -crv /;" diff --git a/CI/tools.py b/CI/tools.py index 668729fec..c72caed19 100644 --- a/CI/tools.py +++ b/CI/tools.py @@ -456,8 +456,6 @@ def prefix(p, s): if "osx" not in os: environ["CC"] = "clang-18" - if os in ("linux", "arm64-linux"): - cargo_features.append("curl-compat") if os.startswith("mingw"): cpu = msys.msys_cpu(env.cpu)