diff --git a/project/jni/openssl/compile.sh b/project/jni/openssl/compile.sh index ab50b30d4..8d6c548c7 100755 --- a/project/jni/openssl/compile.sh +++ b/project/jni/openssl/compile.sh @@ -72,5 +72,6 @@ fi rm -rf include mkdir -p include cp -r -L build/armeabi-v7a/include/openssl include/openssl || exit 1 +patch -p0 < opensslconf.h.patch || exit 1 sed -i.tmp 's@".*/dist/.*"@"."@g' include/openssl/opensslconf.h rm -f include/openssl/opensslconf.h.tmp diff --git a/project/jni/openssl/opensslconf.h.patch b/project/jni/openssl/opensslconf.h.patch new file mode 100644 index 000000000..031d7f011 --- /dev/null +++ b/project/jni/openssl/opensslconf.h.patch @@ -0,0 +1,16 @@ +diff -u -r include/openssl/opensslconf.h include/openssl/opensslconf.h +--- include/openssl/opensslconf.h 2018-06-27 21:41:35.243331385 +0300 ++++ include/openssl/opensslconf.h 2018-06-27 22:00:56.341328455 +0300 +@@ -157,8 +157,10 @@ + #if !defined(OPENSSL_SYS_UEFI) + # define BN_LLONG + /* Only one for the following should be defined */ +-# undef SIXTY_FOUR_BIT_LONG +-# undef SIXTY_FOUR_BIT ++#ifdef __LP64__ ++# define SIXTY_FOUR_BIT_LONG ++# define SIXTY_FOUR_BIT ++#else + # define THIRTY_TWO_BIT + #endif +