| 1 | etiago: Backported this from fornwall's patch. |
| 2 | |
| 3 | XXX: Revert https://github.com/nodejs/node/pull/3135 since it causes |
| 4 | problems when trying to compile on Android with shared libuv, zlib |
| 5 | and openssl due to v8 not using stlport correctly. |
| 6 | |
| 7 | diff -u -r ../node-v4.4.3/configure ./configure > configure.patch |
| 8 | --- ../node-v4.4.3/configure 2016-04-12 19:42:04.000000000 +0000 |
| 9 | +++ ./configure 2016-04-19 09:09:06.036762598 +0000 |
| 10 | @@ -760,15 +760,15 @@ |
| 11 | if pkg_cflags: |
| 12 | output['include_dirs'] += ( |
| 13 | filter(None, map(str.strip, pkg_cflags.split('-I')))) |
| 14 | - elif options.__dict__[shared_lib + '_includes']: |
| 15 | - output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] |
| 16 | + #elif options.__dict__[shared_lib + '_includes']: |
| 17 | + # output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] |
| 18 | |
| 19 | # libpath needs to be provided ahead libraries |
| 20 | if pkg_libpath: |
| 21 | - output['libraries'] += [pkg_libpath] |
| 22 | - elif options.__dict__[shared_lib + '_libpath']: |
| 23 | - output['libraries'] += [ |
| 24 | - '-L%s' % options.__dict__[shared_lib + '_libpath']] |
| 25 | + output['libraries'] += filter(None, map(str.strip, pkg_cflags.split('-L'))) |
| 26 | + #elif options.__dict__[shared_lib + '_libpath']: |
| 27 | + # output['libraries'] += [ |
| 28 | + # '-L%s' % options.__dict__[shared_lib + '_libpath']] |
| 29 | |
| 30 | default_libs = getattr(options, shared_lib + '_libname') |
| 31 | default_libs = map('-l{0}'.format, default_libs.split(',')) |