From 5da396cc76fe73bb307d9c7be509045ddc52e5bf Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 4 Nov 2024 20:20:58 +0000 Subject: [PATCH] linux-arm: upgrade to Debian 11 (glibc 2.31), aids C++17 support --- npm/linux-arm/package.json | 4 ++-- platforms/linux-armv6/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index fbf45128..948aeee9 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.1.0-rc3", + "version": "1.1.0-rc3.1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", @@ -28,7 +28,7 @@ }, "type": "commonjs", "config": { - "glibc": ">=2.28" + "glibc": ">=2.31" }, "os": [ "linux" diff --git a/platforms/linux-armv6/Dockerfile b/platforms/linux-armv6/Dockerfile index ab84dbb2..928b367f 100644 --- a/platforms/linux-armv6/Dockerfile +++ b/platforms/linux-armv6/Dockerfile @@ -1,13 +1,13 @@ FROM debian:buster LABEL maintainer="Lovell Fuller " -# Create Debian 10 (glibc 2.28) container suitable for cross-compiling Linux ARMv6 binaries +# Create Debian 11 (glibc 2.31) container suitable for cross-compiling Linux ARMv6 binaries # Path settings ENV \ RUSTUP_HOME="/usr/local/rustup" \ CARGO_HOME="/usr/local/cargo" \ - PATH="/usr/local/cargo/bin:/root/tools/x64-gcc-12.3.0-glibc-2.28/arm-rpi-linux-gnueabihf/bin:$PATH" + PATH="/usr/local/cargo/bin:/root/tools/x64-gcc-10.3.0-glibc-2.28/arm-rpi-linux-gnueabihf/bin:$PATH" # Build dependencies RUN \