passepartoutvpn
/
openssl-apple
mirror of https://github.com/passepartoutvpn/openssl-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up platforms 

- Rename WatchOS platform to Watch
- Drop Apple Watch armv7k
- Use "MacOSX" sys_id in targets .conf
This commit is contained in:
Davide De Rosa 2020-11-13 22:49:03 +01:00
parent 8ad22a2b3e
commit 2f5cdaf136
4 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
assets/WatchOS/Info.plist → assets/Watch/Info.plist
View File

4
build-libssl.sh
View File

@ -549,8 +549,8 @@ fi
# Build tvOS library if selected for build # Build tvOS library if selected for build
if [ ${#LIBSSL_WATCHOS[@]} -gt 0 ]; then if [ ${#LIBSSL_WATCHOS[@]} -gt 0 ]; then
echo "Build library for watchOS..." echo "Build library for watchOS..."
lipo -create ${LIBSSL_WATCHOS[@]} -output "${CURRENTPATH}/lib/libssl-WatchOS.a" lipo -create ${LIBSSL_WATCHOS[@]} -output "${CURRENTPATH}/lib/libssl-Watch.a"
lipo -create ${LIBCRYPTO_WATCHOS[@]} -output "${CURRENTPATH}/lib/libcrypto-WatchOS.a" lipo -create ${LIBCRYPTO_WATCHOS[@]} -output "${CURRENTPATH}/lib/libcrypto-Watch.a"
fi fi
# Build tvOS library if selected for build # Build tvOS library if selected for build

18
config/20-all-platforms.conf
View File

@ -68,9 +68,9 @@ my %targets = ();
}, },
# Simulator (arm64) # Simulator (arm64)
"ios-sim-cross-arm64" => { "ios-sim-cross-arm64" => {
inherit_from => [ "darwin64-arm64-cc", "ios-cross-base" ], inherit_from => [ "darwin64-arm64-cc", "ios-cross-base" ],
cflags => add("-target arm64-apple-ios13.0-simulator"), cflags => add("-target arm64-apple-ios13.0-simulator"),
sys_id => "iOS", sys_id => "iOS",
}, },
## Apple macOS ## Apple macOS
@ -88,12 +88,12 @@ my %targets = ();
# Device (x86_64) # Device (x86_64)
"macos64-x86_64" => { "macos64-x86_64" => {
inherit_from => [ "darwin64-x86_64-cc", "macos-base" ], inherit_from => [ "darwin64-x86_64-cc", "macos-base" ],
sys_id => "macOS", sys_id => "MacOSX",
}, },
# Device (arm64) # Device (arm64)
"macos64-arm64" => { "macos64-arm64" => {
inherit_from => [ "darwin64-arm64-cc", "macos-base" ], inherit_from => [ "darwin64-arm64-cc", "macos-base" ],
sys_id => "macOS", sys_id => "MacOSX",
}, },
# Catalyst (x86_64) # Catalyst (x86_64)
"mac-catalyst-x86_64" => { "mac-catalyst-x86_64" => {
@ -103,9 +103,9 @@ my %targets = ();
}, },
# Catalyst (arm64) # Catalyst (arm64)
"mac-catalyst-arm64" => { "mac-catalyst-arm64" => {
inherit_from => [ "darwin64-arm64-cc", "mac-catalyst-base" ], inherit_from => [ "darwin64-arm64-cc", "mac-catalyst-base" ],
cflags => add("-target arm64-apple-ios13.0-macabi "), cflags => add("-target arm64-apple-ios13.0-macabi "),
sys_id => "MacOSX", sys_id => "MacOSX",
}, },
## Apple WatchOS ## Apple WatchOS

25
create-openssl-framework.sh
View File

@ -21,22 +21,22 @@ if [ -d $FWROOT ]; then
rm -rf $FWROOT rm -rf $FWROOT
fi fi
ALL_SYSTEMS=("iPhone" "AppleTV" "MacOSX" "Catalyst" "WatchOS") ALL_SYSTEMS=("iPhone" "AppleTV" "MacOSX" "Catalyst" "Watch")
function check_bitcode() { function check_bitcode() {
local FWDIR=$1 local FWDIR=$1
if [[ $FWTYPE == "dynamic" ]]; then if [[ $FWTYPE == "dynamic" ]]; then
BITCODE_PATTERN="__LLVM" BITCODE_PATTERN="__LLVM"
else else
BITCODE_PATTERN="__bitcode" BITCODE_PATTERN="__bitcode"
fi fi
if otool -l "$FWDIR/$FWNAME" | grep "${BITCODE_PATTERN}" >/dev/null; then if otool -l "$FWDIR/$FWNAME" | grep "${BITCODE_PATTERN}" >/dev/null; then
echo "INFO: $FWDIR contains Bitcode" echo "INFO: $FWDIR contains Bitcode"
else else
echo "INFO: $FWDIR doesn't contain Bitcode" echo "INFO: $FWDIR doesn't contain Bitcode"
fi fi
} }
# Inspect Mach-O load commands to get minimum SDK version. # Inspect Mach-O load commands to get minimum SDK version.
@ -187,12 +187,7 @@ if [ $FWTYPE == "dynamic" ]; then
for SYS in ${ALL_SYSTEMS[@]}; do for SYS in ${ALL_SYSTEMS[@]}; do
SYSDIR="$FWROOT/$SYS" SYSDIR="$FWROOT/$SYS"
FWDIR="$SYSDIR/$FWNAME.framework" FWDIR="$SYSDIR/$FWNAME.framework"
DYLIBS=(bin/${SYS}*/$FWNAME.dylib)
if [[ $SYS == "WatchOS" ]]; then
DYLIBS=(bin/Watch*/$FWNAME.dylib)
else
DYLIBS=(bin/${SYS}*/$FWNAME.dylib)
fi
if [[ ${#DYLIBS[@]} -gt 0 && -e ${DYLIBS[0]} ]]; then if [[ ${#DYLIBS[@]} -gt 0 && -e ${DYLIBS[0]} ]]; then
echo "Creating framework for $SYS" echo "Creating framework for $SYS"