You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
1.4 KiB
32 lines
1.4 KiB
9 years ago
|
etiago: Backported this from fornwall's patch.
|
||
|
|
|
||
|
|
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-v4.4.3/configure ./configure > configure.patch
|
||
|
|
--- ../node-v4.4.3/configure 2016-04-12 19:42:04.000000000 +0000
|
||
|
|
+++ ./configure 2016-04-19 09:09:06.036762598 +0000
|
||
|
|
@@ -760,15 +760,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(','))
|