Commit | Line | Data |
---|---|---|
1224589f FF |
1 | XXX: Revert https://github.com/nodejs/node/pull/3135 since it causes |
2 | problems when trying to compile on Android with shared libuv, zlib | |
3 | and openssl due to v8 not using stlport correctly. | |
4 | ||
5 | diff -u -r ../node-v5.4.1/configure ./configure | |
6 | --- ../node-v5.4.1/configure 2016-01-12 16:21:55.000000000 -0500 | |
7 | +++ ./configure 2016-01-14 21:32:40.404401232 -0500 | |
8 | @@ -771,15 +771,15 @@ | |
9 | if pkg_cflags: | |
10 | output['include_dirs'] += ( | |
11 | filter(None, map(str.strip, pkg_cflags.split('-I')))) | |
12 | - elif options.__dict__[shared_lib + '_includes']: | |
13 | - output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] | |
14 | + #elif options.__dict__[shared_lib + '_includes']: | |
15 | + # output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] | |
16 | ||
17 | # libpath needs to be provided ahead libraries | |
18 | if pkg_libpath: | |
19 | - output['libraries'] += [pkg_libpath] | |
20 | - elif options.__dict__[shared_lib + '_libpath']: | |
21 | - output['libraries'] += [ | |
22 | - '-L%s' % options.__dict__[shared_lib + '_libpath']] | |
23 | + output['libraries'] += filter(None, map(str.strip, pkg_cflags.split('-L'))) | |
24 | + #elif options.__dict__[shared_lib + '_libpath']: | |
25 | + # output['libraries'] += [ | |
26 | + # '-L%s' % options.__dict__[shared_lib + '_libpath']] | |
27 | ||
28 | default_libs = getattr(options, shared_lib + '_libname') | |
29 | default_libs = map('-l{0}'.format, default_libs.split(',')) |