Simpler expression for finding vips-cpp libdir (lovell#656)

kapouer · lovell · commit 3a1db53d5aa5 · 2016-12-18T08:57:50.000Z
Fixes: lovell#655
diff --git a/binding.gyp b/binding.gyp
@@ -107,7 +107,7 @@
           ['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/[[:space:]]*$//" | sed -e "s/^$/\/usr\/lib/")/libvips-cpp.so" | c++filt | grep -qF __cxx11;then echo "1";else echo "0";fi)'
+              '_GLIBCXX_USE_CXX11_ABI=<!(if readelf -Ws "$(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --variable libdir vips-cpp)/libvips-cpp.so" | c++filt | grep -qF __cxx11;then echo "1";else echo "0";fi)'
             ]
           }]
         ]

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@`
`107`	`107`	`['OS == "linux"', {`
`108`	`108`	`'defines': [`
`109`	`109`	`# Inspect libvips-cpp.so to determine which C++11 ABI version was used and set _GLIBCXX_USE_CXX11_ABI accordingly. This is quite horrible.`
`110`		`- '_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/[[:space:]]*$//" \| sed -e "s/^$/\/usr\/lib/")/libvips-cpp.so" \| c++filt \| grep -qF __cxx11;then echo "1";else echo "0";fi)'`
	`110`	`+ '_GLIBCXX_USE_CXX11_ABI=<!(if readelf -Ws "$(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --variable libdir vips-cpp)/libvips-cpp.so" \| c++filt \| grep -qF __cxx11;then echo "1";else echo "0";fi)'`
`111`	`111`	`]`
`112`	`112`	`}]`
`113`	`113`	`]`