Skip to content

Commit b7e0c6b

Browse files
committed
Fix binding.gyp for SmartOS
1 parent f431b9b commit b7e0c6b

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

binding.gyp

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,27 @@
3030
"OPENZWAVE_SECURITY=<!@(find <(OZW_INC) -name ZWSecurity.h | wc -l)",
3131
"OPENZWAVE_EXCEPTIONS=<!@(find <(OZW_INC) -name OZWException.h | wc -l)",
3232
"OPENZWAVE_16=<!@(find <(OZW_INC) -name ValueBitSet.h | wc -l)",
33-
"OPENZWAVE_VALUETYPE_FROM_ENUM=<!@(ldconfig -p | grep 'libopenzwave.so ' | awk '{print $4}' | xargs nm -g --demangle |grep OpenZWave::Value::GetTypeNameFromEnum | wc -l)",
34-
"OPENZWAVE_VALUETYPE_FROM_VALUEID=<!@(ldconfig -p | grep 'libopenzwave.so ' | awk '{print $4}' | xargs nm -g --demangle |grep OpenZWave::ValueID::GetTypeAsString | wc -l)"
33+
"OPENZWAVE_VALUETYPE_FROM_ENUM=<!@(nm -g --demangle <(OZW_LIB_PATH)libopenzwave.so | grep OpenZWave::Value::GetTypeNameFromEnum | wc -l)",
34+
"OPENZWAVE_VALUETYPE_FROM_VALUEID=<!@(nm -g --demangle <(OZW_LIB_PATH)libopenzwave.so | grep OpenZWave::ValueID::GetTypeAsString | wc -l)"
35+
],
36+
"cflags": [
37+
"-Wno-ignored-qualifiers",
38+
"-Wno-write-strings",
39+
"-Wno-unknown-pragmas",
40+
"<!@(find <(OZW_INC) -name OZWException.h -exec echo -n \"-fexceptions\" \\;)"
41+
],
42+
"cflags_cc!": [
43+
"<!@(find <(OZW_INC) -name OZWException.h -exec echo -n \"-fno-exceptions\" \\;)"
3544
],
36-
"cflags": [ "-Wno-ignored-qualifiers -Wno-write-strings -Wno-unknown-pragmas" ],
3745
"link_settings": {
3846
"libraries": [
3947
"-R/opt/local/lib/", "-L/opt/local/lib/", "-lopenzwave"
4048
]
4149
},
4250
"include_dirs": [
4351
"<!(node -p -e \"require('path').dirname(require.resolve('nan'))\")",
44-
'/opt/local/include/openzwave/',
45-
'/opt/local/include/openzwave/value_classes/'
52+
"<(OZW_INC)",
53+
"<(OZW_INC)value_classes/"
4654
]
4755
}],
4856
['OS=="mac"', {

0 commit comments

Comments
 (0)