mirror of
https://github.com/lovell/sharp.git
synced 2026-02-06 14:46:16 +01:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1051fcd278 | ||
|
|
1a0030e086 |
10
binding.gyp
10
binding.gyp
@@ -103,11 +103,13 @@
|
|||||||
'libraries': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs --static vips-cpp)']
|
'libraries': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs --static vips-cpp)']
|
||||||
}, {
|
}, {
|
||||||
'libraries': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs vips-cpp)']
|
'libraries': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs vips-cpp)']
|
||||||
|
}],
|
||||||
|
['OS == "linux"', {
|
||||||
|
'defines': [
|
||||||
|
# Inspect libvips-cpp.so to determine which C++11 ABI version was used and set _GLIBCXX_USE_CXX11_ABI accordingly. This is quite horrible.
|
||||||
|
'_GLIBCXX_USE_CXX11_ABI=<!(if readelf -Ws "$(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs-only-L vips-cpp | cut -c 3- | sed -e "s/^$/\/usr\/lib/")/libvips-cpp.so" | c++filt | grep -qF __cxx11;then echo "1";else echo "0";fi)'
|
||||||
|
]
|
||||||
}]
|
}]
|
||||||
],
|
|
||||||
'defines': [
|
|
||||||
# Inspect libvips-cpp.so to determine which C++11 ABI version was used and set _GLIBCXX_USE_CXX11_ABI accordingly. This is quite horrible.
|
|
||||||
'_GLIBCXX_USE_CXX11_ABI=<!(if readelf -Ws "$(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs-only-L vips-cpp | cut -c 3- | sed -e "s/^$/\/usr\/lib/")/libvips-cpp.so" | c++filt | grep -qF __cxx11;then echo "1";else echo "0";fi)'
|
|
||||||
]
|
]
|
||||||
}, {
|
}, {
|
||||||
# Attempt to download pre-built libvips and install locally within node_modules
|
# Attempt to download pre-built libvips and install locally within node_modules
|
||||||
|
|||||||
@@ -4,6 +4,12 @@
|
|||||||
|
|
||||||
Requires libvips v8.3.3
|
Requires libvips v8.3.3
|
||||||
|
|
||||||
|
#### v0.16.2 - 22<sup>nd</sup> October 2016
|
||||||
|
|
||||||
|
* Restrict readelf usage to Linux only when detecting global libvips version.
|
||||||
|
[#602](https://github.com/lovell/sharp/issues/602)
|
||||||
|
[@caoko](https://github.com/caoko)
|
||||||
|
|
||||||
#### v0.16.1 - 13<sup>th</sup> October 2016
|
#### v0.16.1 - 13<sup>th</sup> October 2016
|
||||||
|
|
||||||
* C++11 ABI version is now auto-detected, remove sharp-cxx11 installation flag.
|
* C++11 ABI version is now auto-detected, remove sharp-cxx11 installation flag.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "sharp",
|
"name": "sharp",
|
||||||
"version": "0.16.1",
|
"version": "0.16.2",
|
||||||
"author": "Lovell Fuller <npm@lovell.info>",
|
"author": "Lovell Fuller <npm@lovell.info>",
|
||||||
"contributors": [
|
"contributors": [
|
||||||
"Pierre Inglebert <pierre.inglebert@gmail.com>",
|
"Pierre Inglebert <pierre.inglebert@gmail.com>",
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
"tar": "^2.2.1"
|
"tar": "^2.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"async": "^2.1.0",
|
"async": "^2.1.2",
|
||||||
"bufferutil": "^1.2.1",
|
"bufferutil": "^1.2.1",
|
||||||
"coveralls": "^2.11.14",
|
"coveralls": "^2.11.14",
|
||||||
"exif-reader": "^1.0.1",
|
"exif-reader": "^1.0.1",
|
||||||
|
|||||||
Reference in New Issue
Block a user