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

Upgrade to modern detect-libc

Browse Source
This commit is contained in:
Lovell Fuller 2022-01-19 11:27:24 +00:00
parent f8340e1a82
commit 884947a069
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
install/libvips.js
View File

@ -132,14 +132,16 @@ try {
throw new Error(`BSD/SunOS systems require manual installation of libvips >= ${minimumLibvipsVersion}`); throw new Error(`BSD/SunOS systems require manual installation of libvips >= ${minimumLibvipsVersion}`);
} }
// Linux libc version check // Linux libc version check
if (detectLibc.family === detectLibc.GLIBC && detectLibc.version && minimumGlibcVersionByArch[arch]) { const libcFamily = detectLibc.familySync();
if (semverLessThan(`${detectLibc.version}.0`, `${minimumGlibcVersionByArch[arch]}.0`)) { const libcVersion = detectLibc.versionSync();
handleError(new Error(`Use with glibc ${detectLibc.version} requires manual installation of libvips >= ${minimumLibvipsVersion}`)); if (libcFamily === detectLibc.GLIBC && libcVersion && minimumGlibcVersionByArch[arch]) {
if (semverLessThan(`${libcVersion}.0`, `${minimumGlibcVersionByArch[arch]}.0`)) {
handleError(new Error(`Use with glibc ${libcVersion} requires manual installation of libvips >= ${minimumLibvipsVersion}`));
} }
} }
if (detectLibc.family === detectLibc.MUSL && detectLibc.version) { if (libcFamily === detectLibc.MUSL && libcVersion) {
if (semverLessThan(detectLibc.version, '1.1.24')) { if (semverLessThan(libcVersion, '1.1.24')) {
handleError(new Error(`Use with musl ${detectLibc.version} requires manual installation of libvips >= ${minimumLibvipsVersion}`)); handleError(new Error(`Use with musl ${libcVersion} requires manual installation of libvips >= ${minimumLibvipsVersion}`));
} }
} }
// Node.js minimum version check // Node.js minimum version check

2
lib/platform.js
View File

@ -8,7 +8,7 @@ module.exports = function () {
const arch = env.npm_config_arch || process.arch; const arch = env.npm_config_arch || process.arch;
const platform = env.npm_config_platform || process.platform; const platform = env.npm_config_platform || process.platform;
/* istanbul ignore next */ /* istanbul ignore next */
const libc = (platform === 'linux' && detectLibc.isNonGlibcLinux) ? detectLibc.family : ''; const libc = (platform === 'linux' && detectLibc.isNonGlibcLinuxSync()) ? detectLibc.familySync() : '';
const platformId = [`${platform}${libc}`]; const platformId = [`${platform}${libc}`];

2
lib/utility.js
View File

@ -128,7 +128,7 @@ function concurrency (concurrency) {
return sharp.concurrency(is.integer(concurrency) ? concurrency : null); return sharp.concurrency(is.integer(concurrency) ? concurrency : null);
} }
/* istanbul ignore next */ /* istanbul ignore next */
if (detectLibc.family === detectLibc.GLIBC && !sharp._isUsingJemalloc()) { if (detectLibc.familySync() === detectLibc.GLIBC && !sharp._isUsingJemalloc()) {
// Reduce default concurrency to 1 when using glibc memory allocator // Reduce default concurrency to 1 when using glibc memory allocator
sharp.concurrency(1); sharp.concurrency(1);
} }

2
package.json
View File

@ -126,7 +126,7 @@
], ],
"dependencies": { "dependencies": {
"color": "^4.2.0", "color": "^4.2.0",
"detect-libc": "^1.0.3", "detect-libc": "^2.0.0",
"node-addon-api": "^4.2.0", "node-addon-api": "^4.2.0",
"prebuild-install": "^7.0.0", "prebuild-install": "^7.0.0",
"semver": "^7.3.5", "semver": "^7.3.5",

5
test/unit/beforeEach.js
View File

@ -3,10 +3,11 @@
const detectLibc = require('detect-libc'); const detectLibc = require('detect-libc');
const sharp = require('../../'); const sharp = require('../../');
const usingCache = detectLibc.family !== detectLibc.MUSL; const libcFamily = detectLibc.familySync();
const usingCache = libcFamily !== detectLibc.MUSL;
const usingSimd = !process.env.G_DEBUG; const usingSimd = !process.env.G_DEBUG;
const concurrency = const concurrency =
detectLibc.family === detectLibc.MUSL || process.arch === 'arm' libcFamily === detectLibc.MUSL || process.arch === 'arm'
? 1 ? 1
: undefined; : undefined;