Fredrik Fornwall
8 years ago
3 changed files with 3 additions and 59 deletions
@ -1,27 +0,0 @@ |
|||||
diff -u -r ../node-v6.5.0/common.gypi ./common.gypi
|
|
||||
--- ../node-v6.5.0/common.gypi 2016-08-26 11:27:16.000000000 -0400
|
|
||||
+++ ./common.gypi 2016-09-14 18:33:18.677745057 -0400
|
|
||||
@@ -78,7 +78,10 @@
|
|
||||
}], |
|
||||
['OS == "android"', { |
|
||||
'cflags': [ '-fPIE' ], |
|
||||
- 'ldflags': [ '-fPIE', '-pie' ]
|
|
||||
+ 'ldflags': [ '-fPIE' ],
|
|
||||
+ 'target_conditions': [
|
|
||||
+ ['_type == "executable"', {'ldflags': [ '-pie' ]}]
|
|
||||
+ ]
|
|
||||
}], |
|
||||
['node_shared=="true"', { |
|
||||
'msvs_settings': { |
|
||||
@@ -128,7 +131,10 @@
|
|
||||
}], |
|
||||
['OS == "android"', { |
|
||||
'cflags': [ '-fPIE' ], |
|
||||
- 'ldflags': [ '-fPIE', '-pie' ]
|
|
||||
+ 'ldflags': [ '-fPIE' ],
|
|
||||
+ 'target_conditions': [
|
|
||||
+ ['_type == "executable"', {'ldflags': [ '-pie' ]}]
|
|
||||
+ ]
|
|
||||
}], |
|
||||
['node_shared=="true"', { |
|
||||
'msvs_settings': { |
|
@ -1,29 +0,0 @@ |
|||||
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(',')) |
|
Loading…
Reference in new issue