Add SSE2-only linux-x64 build

Author: Doy-lee

.github/workflows/ci.yml

@@ -30,9 +30,8 @@ jobs:
         include:
           - os: "ubuntu-24.04"
             platform: "linux-x64"
-          # FIXME enable this back
           - os: "ubuntu-24.04"
-            platform: "linux-armv6"
+            platform: "linux-sse2-x64"
           - os: "ubuntu-24.04"
             platform: "win32-x64"
           - os: "macos-15-intel"

README.md

@@ -18,7 +18,7 @@ One [build script](build/posix.sh) is used to (cross-)compile
 the same shared libraries within multiple containers.
 
 - [x64 glibc](platforms/linux-x64/Dockerfile)
-- [ARMv6 glibc](platforms/linux-armv6/Dockerfile)
+- [x64 sse2 glibc](platforms/linux-sse2-x64/Dockerfile)
 - [ARM64v8-A glibc](platforms/linux-arm64v8/Dockerfile)
 
 ### Windows

build.sh

@@ -12,7 +12,7 @@ if [ $# -lt 1 ]; then
   echo "Possible values for PLATFORM are:"
   echo "- win32-x64"
   echo "- linux-x64"
-  echo "- linux-armv6"
+  echo "- linux-sse2-x64"
   echo "- linux-arm64v8"
   echo "- darwin-x64"
   echo "- darwin-arm64v8"
@@ -75,8 +75,8 @@ for flavour in win32-x64; do
   fi
 done
 
-# Linux (x64, ARMv6, ARM64v8)
-for flavour in linux-x64 linux-armv6 linux-arm64v8; do
+# Linux (x64, x64 with sse2, ARM64v8)
+for flavour in linux-x64 linux-sse2-x64 linux-arm64v8; do
   if [ $PLATFORM = "all" ] || [ $PLATFORM = $flavour ]; then
     echo "Building $flavour..."
     docker build --pull -t vips-dev-$flavour platforms/$flavour

npm/linux-arm/package.json npm/linux-sse2-x64/package.jsonnpm/linux-arm/package.json renamed to npm/linux-sse2-x64/package.json

@@ -1,13 +1,13 @@
 {
-  "name": "@img/sharp-libvips-linux-arm",
+  "name": "@img/sharp-libvips-linux-sse2-x64",
   "version": "1.2.7",
-  "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM",
+  "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) x64 (SSE2 build)",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lovell/sharp-libvips.git",
-    "directory": "npm/linux-arm"
+    "directory": "npm/linux-x64"
   },
   "license": "LGPL-3.0-or-later",
   "funding": {
@@ -21,14 +21,14 @@
     "lib",
     "versions.json"
   ],
+  "type": "commonjs",
   "exports": {
     "./lib": "./lib/index.js",
     "./package": "./package.json",
     "./versions": "./versions.json"
   },
-  "type": "commonjs",
   "config": {
-    "glibc": ">=2.31"
+    "glibc": ">=2.26"
   },
   "os": [
     "linux"
@@ -37,6 +37,6 @@
     "glibc"
   ],
   "cpu": [
-    "arm"
+    "x64"
   ]
 }

npm/package.json

@@ -6,9 +6,9 @@
     "dev",
     "darwin-x64",
     "darwin-arm64",
-    "linux-arm",
     "linux-arm64",
     "linux-x64",
+    "linux-sse2-x64",
     "win32-x64"
   ]
 }

package-npm-packages.sh

@@ -11,5 +11,4 @@ npm pack --workspaces --pack-destination=${GITHUB_WORKSPACE}/dist
 ls -la ${GITHUB_WORKSPACE}/dist
 pwd
 
-cd ../
 npm pack --pack-destination=${GITHUB_WORKSPACE}/dist

platforms/linux-armv6/Dockerfile

@@ -0,0 +1,67 @@
+FROM amazonlinux:2
+LABEL maintainer="Lovell Fuller <npm@lovell.info>"
+
+# Create Amazon Linux 2 (glibc 2.26) container suitable for building Linux x64 binaries
+
+# Path settings
+ENV \
+  RUSTUP_HOME="/usr/local/rustup" \
+  CARGO_HOME="/usr/local/cargo" \
+  PATH="/usr/local/cargo/bin:$PATH"
+
+# Build dependencies
+RUN \
+  yum update -y && \
+  amazon-linux-extras install epel -y && \
+  yum install -y --setopt=tsflags=nodocs \
+    --exclude=gcc \
+    autoconf \
+    automake \
+    bzip2 \
+    cmake3 \
+    curl \
+    gcc10 \
+    gcc10-binutils \
+    gcc10-c++ \
+    gettext \
+    git \
+    gperf \
+    jq \
+    make \
+    nasm \
+    openssl-devel \
+    patch \
+    pkgconfig \
+    python3 \
+    tar \
+    xz \
+    && \
+  ln -s /usr/bin/gcc10-gcc /usr/bin/cc && \
+  ln -s /usr/bin/gcc10-g++ /usr/bin/c++ && \
+  ln -s /usr/bin/gcc10-ar /usr/bin/ar && \
+  ln -s /usr/bin/gcc10-nm /usr/bin/nm && \
+  ln -s /usr/bin/gcc10-ld.bfd /usr/bin/ld && \
+  ln -s /usr/bin/gcc10-strip /usr/bin/strip && \
+  ln -s /usr/bin/gcc10-ranlib /usr/bin/ranlib && \
+  ln -s /usr/bin/gcc10-readelf /usr/bin/readelf && \
+  ln -sf /usr/bin/gcc10-ld.bfd /usr/bin/gcc10-ld && \
+  rm /usr/bin/gcc10-ld.gold && \
+  curl https://sh.rustup.rs -sSf | sh -s -- -y \
+    --no-modify-path \
+    --profile minimal \
+    --default-toolchain nightly \
+    && \
+  cargo install cargo-c --locked && \
+  ln -s /usr/bin/cmake3 /usr/bin/cmake && \
+  pip3 install meson ninja tomli
+
+# Compiler settings
+ENV \
+  PKG_CONFIG="pkg-config --static" \
+  PLATFORM="linux-sse2-x64" \
+  FLAGS="-march=x86-64" \
+  RUSTFLAGS="-Zlocation-detail=none -Zfmt-debug=none" \
+  MESON="--cross-file=/root/meson.ini"
+
+COPY Toolchain.cmake /root/
+COPY meson.ini /root/