From 6592361c5a4eee7ddeea32270f2e1f1fd293be63 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 26 Apr 2017 21:41:03 +0100 Subject: [PATCH] Ensure ARM64 pre-built binaries use correct C++11 ABI --- binding.js | 4 ++-- docs/changelog.md | 8 ++++++++ packaging/linux-armv8/Dockerfile | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/binding.js b/binding.js index 0858f09f..4695a2b5 100644 --- a/binding.js +++ b/binding.js @@ -42,8 +42,8 @@ const unpack = function (tarPath, done) { const platformId = function () { const platformId = [platform]; - if (arch === 'arm' || arch === 'armhf' || arch === 'arch64') { - const armVersion = (arch === 'arch64') ? '8' : process.env.npm_config_armv || process.config.variables.arm_version || '6'; + if (arch === 'arm' || arch === 'armhf' || arch === 'arm64') { + const armVersion = (arch === 'arm64') ? '8' : process.env.npm_config_armv || process.config.variables.arm_version || '6'; platformId.push('armv' + armVersion); } else { platformId.push(arch); diff --git a/docs/changelog.md b/docs/changelog.md index 842045c7..09a9c651 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -14,6 +14,14 @@ Requires libvips v8.5.2. [#607](https://github.com/lovell/sharp/issues/607) [@puzrin](https://github.com/puzrin) +* Ensure ARM64 pre-built binaries use correct C++11 ABI version. + [#772](https://github.com/lovell/sharp/issues/772) + [@ajiratech2](https://github.com/ajiratech2) + +* Expose libvips' "squash" parameter to enable 1-bit TIFF output. + [#783](https://github.com/lovell/sharp/pull/783) + [@YvesBos](https://github.com/YvesBos) + ### v0.17 - "*quill*" Requires libvips v8.4.2. diff --git a/packaging/linux-armv8/Dockerfile b/packaging/linux-armv8/Dockerfile index 41029ac2..12948d96 100644 --- a/packaging/linux-armv8/Dockerfile +++ b/packaging/linux-armv8/Dockerfile @@ -15,4 +15,4 @@ RUN \ ENV \ PLATFORM=linux-armv8 \ CHOST=aarch64-linux-gnu \ - FLAGS="-march=armv8-a -Os" + FLAGS="-march=armv8-a -Os -D_GLIBCXX_USE_CXX11_ABI=0"