diff options
| author | levlam <levlam@telegram.org> | 2022-10-14 23:09:16 +0300 |
|---|---|---|
| committer | levlam <levlam@telegram.org> | 2022-10-14 23:09:16 +0300 |
| commit | bfd8c8dcf37243a752d7fa5fb8e5f319497c1482 (patch) | |
| tree | 5cb15d7941e91f767a0b77686162ada7da6dbefd /example/ios | |
| parent | ec86b34d557c031b0b07929734decc561315eac1 (diff) | |
Fix OpenSSL building in iOS example.
Diffstat (limited to 'example/ios')
| -rw-r--r-- | example/ios/Python-Apple-support.patch | 8 | ||||
| -rwxr-xr-x | example/ios/build-openssl.sh | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/example/ios/Python-Apple-support.patch b/example/ios/Python-Apple-support.patch index e1238a100..cb551bf70 100644 --- a/example/ios/Python-Apple-support.patch +++ b/example/ios/Python-Apple-support.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 695be54..9d4f4a4 100644 +index 695be54..eda7b0d 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,11 @@ @@ -96,9 +96,9 @@ index 695be54..9d4f4a4 100644 CROSS_SDK="$$(notdir $$(SDK_ROOT-$1))" \ - make all && make install + make build_libs && \ -+ mkdir -p "$(PROJECT_DIR)/build/$2" && \ -+ cp libcrypto.a libssl.a "$(PROJECT_DIR)/build/$2" && \ -+ make install_sw ++ mkdir -p "$(PROJECT_DIR)/build/$2/openssl/lib" && \ ++ cp libcrypto.a libssl.a "$(PROJECT_DIR)/build/$2/openssl/lib" ++ -cd $$(OPENSSL_DIR-$1) && make install_sw 2> /dev/null # Unpack BZip2 $$(BZIP2_DIR-$1)/Makefile: downloads/bzip2-$(BZIP2_VERSION).tgz diff --git a/example/ios/build-openssl.sh b/example/ios/build-openssl.sh index 7602e0302..eac937caa 100755 --- a/example/ios/build-openssl.sh +++ b/example/ios/build-openssl.sh @@ -26,12 +26,12 @@ do echo $platform cd Python-Apple-support #NB: -j will fail - make OpenSSL-$platform + make OpenSSL-$platform || exit 1 cd .. - rm -rf third_party/openssl/$platform - mkdir -p third_party/openssl/$platform/lib - cp ./Python-Apple-support/build/$platform/libcrypto.a third_party/openssl/$platform/lib/ - cp ./Python-Apple-support/build/$platform/libssl.a third_party/openssl/$platform/lib/ - cp -r ./Python-Apple-support/build/$platform/openssl/include/ third_party/openssl/$platform/include + rm -rf third_party/openssl/$platform || exit 1 + mkdir -p third_party/openssl/$platform/lib || exit 1 + cp ./Python-Apple-support/build/$platform/libcrypto.a third_party/openssl/$platform/lib/ || exit 1 + cp ./Python-Apple-support/build/$platform/libssl.a third_party/openssl/$platform/lib/ || exit 1 + cp -r ./Python-Apple-support/build/$platform/openssl/include/ third_party/openssl/$platform/include || exit 1 done done |