Switch to amazonlinux:2023

Author: johnnynotsolucky

build/posix.sh

@@ -442,7 +442,7 @@ sed -i'.bak' "/subdir('man')/{N;N;N;N;d;}" meson.build
 CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" meson setup _build --default-library=shared --buildtype=release --strip --prefix=${TARGET} ${MESON} \
   -Ddeprecated=false -Dexamples=false -Dauto_features=enabled -Dintrospection=disabled -Dmodules=disabled -Dcfitsio=disabled -Dfftw=disabled \
   ${WITHOUT_HIGHWAY:+-Dhighway=disabled} -Dorc=disabled -Dmagick=disabled -Dmatio=disabled -Dnifti=disabled -Dopenexr=disabled \
-  -Dopenslide=disabled -Dpdfium=disabled -Dpoppler=disabled -Dquantizr=disabled \
+  -Dopenslide=disabled -Dpdfium=disabled -Dpoppler=disabled -Dquantizr=disabled -Draw=disabled \
   -Dppm=false -Danalyze=false -Dradiance=false \
   ${LINUX:+-Dcpp_link_args="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--version-script=$DEPS/vips/vips.map $EXCLUDE_LIBS"}
 meson install -C _build --tag runtime,devel

platforms/linux-arm64v8/Dockerfile

@@ -1,37 +1,36 @@
-FROM --platform=linux/arm64 rockylinux:8
+FROM arm64v8/amazonlinux:2023
 LABEL maintainer="Lovell Fuller <npm@lovell.info>"
 
-# Create Rocky Linux 8 (glibc 2.28) container suitable for building Linux ARM64v8-A binaries
+# Create Amazon Linux 2023 (glibc 2.34) container suitable for building Linux ARM64v8-A binaries
 
 # Path settings
 ENV \
   RUSTUP_HOME="/usr/local/rustup" \
   CARGO_HOME="/usr/local/cargo" \
-  PATH="/usr/local/cargo/bin:/opt/rh/gcc-toolset-15/root/usr/bin:$PATH"
+  PATH="/usr/local/cargo/bin:$PATH"
 
 # Build dependencies
 RUN \
   dnf update -y && \
-  dnf install -y epel-release && \
-  dnf config-manager --set-enabled powertools && \
   dnf install -y --setopt=tsflags=nodocs \
     autoconf \
     automake \
     bzip2 \
     cmake \
     curl-devel \
-    findutils \
-    gcc-toolset-15-gcc \
-    gcc-toolset-15-gcc-c++ \
+    gcc \
+    gcc-c++ \
+    binutils \
     gettext \
     git \
     gperf \
     jq \
     make \
     openssl-devel \
     patch \
-    pkgconf \
-    python3.12-pip \
+    pkgconfig \
+    python3 \
+    python3-pip \
     tar \
     xz \
     && \
@@ -42,16 +41,15 @@ RUN \
     --default-toolchain nightly \
     && \
   cargo install cargo-c --locked && \
-  pip3.12 install meson ninja
+  pip3 install meson ninja tomli
 
 # Compiler settings
 ENV \
-  PKG_CONFIG="aarch64-linux-gnu-pkgconf --static" \
+  PKG_CONFIG="pkg-config --static" \
   PLATFORM="linux-arm64v8" \
   FLAGS="-march=armv8-a" \
   RUSTFLAGS="-Zlocation-detail=none -Zfmt-debug=none" \
   MESON="--cross-file=/root/meson.ini"
 
 COPY Toolchain.cmake /root/
 COPY meson.ini /root/
-COPY aarch64-linux-gnu-pkgconf /usr/bin