Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-07-12 20:10:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ensure ARM64 pre-built binaries use correct C++11 ABI

Browse Source
This commit is contained in:
Lovell Fuller 2017-04-26 21:41:03 +01:00
parent f3f83494f5
commit 6592361c5a
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binding.js
View File

@ -42,8 +42,8 @@ const unpack = function (tarPath, done) {
const platformId = function () { const platformId = function () {
const platformId = [platform]; const platformId = [platform];
if (arch === 'arm' || arch === 'armhf' || arch === 'arch64') { if (arch === 'arm' || arch === 'armhf' || arch === 'arm64') {
const armVersion = (arch === 'arch64') ? '8' : process.env.npm_config_armv || process.config.variables.arm_version || '6'; const armVersion = (arch === 'arm64') ? '8' : process.env.npm_config_armv || process.config.variables.arm_version || '6';
platformId.push('armv' + armVersion); platformId.push('armv' + armVersion);
} else { } else {
platformId.push(arch); platformId.push(arch);

8
docs/changelog.md
View File

@ -14,6 +14,14 @@ Requires libvips v8.5.2.
[#607](https://github.com/lovell/sharp/issues/607) [#607](https://github.com/lovell/sharp/issues/607)
[@puzrin](https://github.com/puzrin) [@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*" ### v0.17 - "*quill*"
Requires libvips v8.4.2. Requires libvips v8.4.2.

2
packaging/linux-armv8/Dockerfile
View File

@ -15,4 +15,4 @@ RUN \
ENV \ ENV \
PLATFORM=linux-armv8 \ PLATFORM=linux-armv8 \
CHOST=aarch64-linux-gnu \ CHOST=aarch64-linux-gnu \
FLAGS="-march=armv8-a -Os" FLAGS="-march=armv8-a -Os -D_GLIBCXX_USE_CXX11_ABI=0"