1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zlib: fix discovery of cpu-features.h for android

Browse Source 
Fixed cpu-features.h not found issue.

Co-Authored-By: Luigi Pinca <luigipinca@gmail.com>
Fixes: https://github.com/nodejs/node/issues/49766
PR-URL: https://github.com/nodejs/node/pull/49828
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
This commit is contained in:
MatteoBax 2023-09-29 14:34:21 +02:00 committed by Richard Lau
parent 1b96975f27
commit 16ac5e1ca8
No known key found for this signature in database
GPG Key ID: C43CEC45C17AB93C
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android_configure.py
View File

@ -70,6 +70,7 @@ GYP_DEFINES = "target_arch=" + arch
GYP_DEFINES += " v8_target_arch=" + arch GYP_DEFINES += " v8_target_arch=" + arch
GYP_DEFINES += " android_target_arch=" + arch GYP_DEFINES += " android_target_arch=" + arch
GYP_DEFINES += " host_os=" + host_os + " OS=android" GYP_DEFINES += " host_os=" + host_os + " OS=android"
GYP_DEFINES += " android_ndk_path=" + android_ndk_path
os.environ['GYP_DEFINES'] = GYP_DEFINES os.environ['GYP_DEFINES'] = GYP_DEFINES
if os.path.exists("./configure"): if os.path.exists("./configure"):

2
common.gypi
View File

@ -230,7 +230,7 @@
], ],
},], },],
['OS == "android"', { ['OS == "android"', {
'cflags': [ '-fPIC' ], 'cflags': [ '-fPIC', '-I<(android_ndk_path)/sources/android/cpufeatures' ],
'ldflags': [ '-fPIC' ] 'ldflags': [ '-fPIC' ]
}], }],
], ],