Fixed OpenSSL build headers.
This commit is contained in:
parent
7b5d0d59c9
commit
fddf710a1c
@ -17,7 +17,6 @@ SDK_VERSION=""
|
|||||||
# Minimum SDK version the application supports
|
# Minimum SDK version the application supports
|
||||||
MIN_SDK_VERSION=""
|
MIN_SDK_VERSION=""
|
||||||
|
|
||||||
|
|
||||||
## Defaults
|
## Defaults
|
||||||
INSTALLDIR="external"
|
INSTALLDIR="external"
|
||||||
|
|
||||||
@ -44,9 +43,9 @@ if [ ! -d "$DEVELOPER" ]; then
|
|||||||
echo "sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer"
|
echo "sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
function run {
|
function run {
|
||||||
echo "PATH=$PATH"
|
"$@"
|
||||||
$@
|
|
||||||
local status=$?
|
local status=$?
|
||||||
if [ $status -ne 0 ]; then
|
if [ $status -ne 0 ]; then
|
||||||
echo "error with $@" >&2
|
echo "error with $@" >&2
|
||||||
@ -62,7 +61,7 @@ function buildArch(){
|
|||||||
then
|
then
|
||||||
PLATFORM="iPhoneSimulator"
|
PLATFORM="iPhoneSimulator"
|
||||||
else
|
else
|
||||||
sed -ie "s!static volatile sig_atomic_t intr_signal;!static volatile intr_signal;!" "crypto/ui/ui_openssl.c"
|
run sed -ie "s!static volatile sig_atomic_t intr_signal;!static volatile intr_signal;!" "crypto/ui/ui_openssl.c"
|
||||||
PLATFORM="iPhoneOS"
|
PLATFORM="iPhoneOS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -144,20 +143,20 @@ case `pwd` in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# Cleanup old build artifacts
|
# Cleanup old build artifacts
|
||||||
run mkdir -p ../../include/openssl
|
run rm -rf ../../include
|
||||||
run rm -f ../../include/openssl/*.h
|
run mkdir -p ../../include
|
||||||
|
|
||||||
|
run rm -rf ../../lib
|
||||||
run mkdir -p ../../lib
|
run mkdir -p ../../lib
|
||||||
run rm -f ../../lib/*.a
|
|
||||||
|
|
||||||
echo "Copying header files ..."
|
|
||||||
run cp include/openssl/*.h ../../include/openssl/
|
|
||||||
echo
|
|
||||||
|
|
||||||
for i in ${ARCHS}; do
|
for i in ${ARCHS}; do
|
||||||
buildArch $i
|
buildArch $i
|
||||||
done
|
done
|
||||||
|
|
||||||
|
echo "Copying header files ..."
|
||||||
|
run cp -r include/ ../../include/
|
||||||
|
echo
|
||||||
|
|
||||||
echo "Combining to unversal binary"
|
echo "Combining to unversal binary"
|
||||||
run lipo -create ../../lib/libcrypto_*.a -o ../../lib/libcrypto.a
|
run lipo -create ../../lib/libcrypto_*.a -o ../../lib/libcrypto.a
|
||||||
run lipo -create ../../lib/libssl_*.a -o ../../lib/libssl.a
|
run lipo -create ../../lib/libssl_*.a -o ../../lib/libssl.a
|
||||||
|
Loading…
Reference in New Issue
Block a user