Skip to content

Commit

Permalink
Fix OpenSSL building in iOS example.
Browse files Browse the repository at this point in the history
  • Loading branch information
levlam committed Oct 14, 2022
1 parent ec86b34 commit bfd8c8d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions example/ios/Python-Apple-support.patch
Original file line number Diff line number Diff line change
@@ -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 @@
Expand Down Expand Up @@ -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
12 changes: 6 additions & 6 deletions example/ios/build-openssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit bfd8c8d

Please sign in to comment.