30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
|
XXX: Revert https://github.com/nodejs/node/pull/3135 since it causes
|
||
|
|
problems when trying to compile on Android with shared libuv, zlib
|
||
|
|
and openssl due to v8 not using stlport correctly.
|
||
|
|
|
||
|
|
diff -u -r ../node-v5.4.1/configure ./configure
|
||
|
|
--- ../node-v5.4.1/configure 2016-01-12 16:21:55.000000000 -0500
|
||
|
|
+++ ./configure 2016-01-14 21:32:40.404401232 -0500
|
||
|
|
@@ -771,15 +771,15 @@
|
||
|
|
if pkg_cflags:
|
||
|
|
output['include_dirs'] += (
|
||
|
|
filter(None, map(str.strip, pkg_cflags.split('-I'))))
|
||
|
|
- elif options.__dict__[shared_lib + '_includes']:
|
||
|
|
- output['include_dirs'] += [options.__dict__[shared_lib + '_includes']]
|
||
|
|
+ #elif options.__dict__[shared_lib + '_includes']:
|
||
|
|
+ # output['include_dirs'] += [options.__dict__[shared_lib + '_includes']]
|
||
|
|
|
||
|
|
# libpath needs to be provided ahead libraries
|
||
|
|
if pkg_libpath:
|
||
|
|
- output['libraries'] += [pkg_libpath]
|
||
|
|
- elif options.__dict__[shared_lib + '_libpath']:
|
||
|
|
- output['libraries'] += [
|
||
|
|
- '-L%s' % options.__dict__[shared_lib + '_libpath']]
|
||
|
|
+ output['libraries'] += filter(None, map(str.strip, pkg_cflags.split('-L')))
|
||
|
|
+ #elif options.__dict__[shared_lib + '_libpath']:
|
||
|
|
+ # output['libraries'] += [
|
||
|
|
+ # '-L%s' % options.__dict__[shared_lib + '_libpath']]
|
||
|
|
|
||
|
|
default_libs = getattr(options, shared_lib + '_libname')
|
||
|
|
default_libs = map('-l{0}'.format, default_libs.split(','))
|