Commit Graph

111 Commits

Author SHA1 Message Date
Davide De Rosa 2f5cdaf136 Clean up platforms
- Rename WatchOS platform to Watch
- Drop Apple Watch armv7k
- Use "MacOSX" sys_id in targets .conf
2020-11-14 15:42:00 +01:00
Davide De Rosa 2d7d115186 Add arm64 targets
- New Macs
- Catalyst
- iPhone Simulator
2020-11-12 19:00:09 +01:00
Davide De Rosa 2be1214e3b Strip and reorder targets
- Adjust target min SDKs to build script
- Split opensslconf suffix by platform
- Drop old i386 targets
2020-11-12 18:59:46 +01:00
Davide De Rosa 506c071196 Add macOS Catalyst support
Backported from fork:

- https://github.com/balthisar/openssl-xcframeworks
2020-11-07 13:21:31 +01:00
Davide De Rosa 53c7af66e3 Bump default version to 1.1.1h 2020-11-07 13:21:04 +01:00
Davide De Rosa 184673f650 Drop support for OpenSSL 1.0.x 2020-11-07 00:21:11 +01:00
Andreas Verhoeven a8745f135e Adds support for WatchOS Simulator on Xcode 12 (x86_64) 2020-10-14 16:49:39 +02:00
Alexei Lozovsky d577228bbd Make minimum SDK version configurable
In some use cases it's necessary to support older systems. Currently
minimum SDK versions are set to reasonable defaults, but there is no
easy way to override them.

Introduce a new set of command-line flags to set different minimum SDK
versions, similar to how it's possible to override the default target
SDK version:

    --min-macos-sdk
    --min-ios-sdk
    --min-tvos-sdk
    --min-watchos-sdk

Also, output the selected minimum SDK version along with the target one
on the configuration readout. It makes it easier to confirm that the
configuration is the one you expect.
2020-05-09 18:26:12 +03:00
Davide De Rosa 7df037b599 Default to 1.1.1g 2020-04-21 21:46:13 +02:00
Davide De Rosa b152da304e Use minor version for macOS only
See 084a0cca75
2020-04-18 16:28:33 +02:00
Davide De Rosa 1ff0936171 Default to OpenSSL 1.1.1f 2020-04-18 16:12:26 +02:00
Davide De Rosa 084a0cca75 Truncate SDK folder to minor version
Fixes #15
2020-04-18 14:58:40 +02:00
Davide De Rosa 7e774ecb47 Support arm64e
Credits to: https://github.com/x2on/OpenSSL-for-iPhone/pull/182
2020-03-01 22:55:21 +01:00
Felix Schulze 2148236b16 Remove test while building openssl
Fixes fork() issue
2020-03-01 22:35:43 +01:00
Davide De Rosa 1db1a8dc76 Bump version to 1.1.1 in scripts 2019-11-01 16:26:56 +01:00
Davide De Rosa 78a70f645d Add WatchOS targets to build script
Squash commits by ezathashim <ezathashim@mac.com>
2019-09-26 09:39:59 +02:00
Davide De Rosa a6958f4c9b Default to 64-bit only
- Raise platform targets.
- Drop 32-bit OpenSSL targets.
- Default to 1.1.0
2018-09-26 13:04:51 +02:00
Davide De Rosa dbba12308a Drop i386, deprecated in Xcode 10 2018-09-24 13:59:07 +02:00
Davide De Rosa 2bd9b363cc Restrict to SDKs supporting dynamic frameworks
- Start from iOS 8
- Never disable Bitcode
2018-02-08 16:51:28 +01:00
Davide De Rosa fbef7e0dca Prefix iOS archs for consistency 2018-02-08 16:45:10 +01:00
Davide De Rosa e455f1a1ae Add macOS archs/targets 2018-02-08 16:45:10 +01:00
Davide De Rosa 10b342fb7e Create frameworks for both iPhone and AppleTV 2017-10-01 21:53:50 +02:00
Felix Schulze 39d1e04c7b OpenSSL 1.0.2l 2017-05-25 20:23:22 +02:00
g4bor k0vacs db8e598554 Allow to disable embedding Bitcode for OpenSSL 1.1.0+ too 2017-03-13 02:20:27 +01:00
g4bor k0vacs fd0b497792 Disable embedding Bitcode: --disable-bitcode option added (for OpenSSL 1.0.2 and lower ONLY) 2017-03-07 14:14:39 +01:00
Anton Tieleman 9a9119669b Preprocessor error for unknown targets and include for TargetConditionals.h 2017-03-04 13:06:21 +01:00
Anton Tieleman 11857a8da6 Dynamically generate opensslconf.h intermediate file
- Only use intermediate file when building for multiple targets
2017-02-17 17:47:43 +01:00
Anton Tieleman 2316fa0cfb Commit to trigger CI 2017-02-03 23:08:33 +01:00
Anton Tieleman 97f7ec7881 Also determine latest version in a branch over https 2017-02-01 19:23:30 +01:00
Anton Tieleman 35951c2bdc Also switch to https for determining correct download path 2017-01-30 22:23:04 +01:00
Anton Tieleman d5cc504e70 Find archive on ftp, but download over https 2017-01-30 22:05:51 +01:00
Anton Tieleman 7832285d81 Download from ftp.openssl.org 2017-01-28 15:59:16 +01:00
Anton Tieleman fcfe48afdd OpenSSL 1.0.2k and 1.1.0d + Travis build with Xcode 8.2
- Also remove xctool lines since they won't support building for Xcode 8
2017-01-27 22:21:12 +01:00
Anton Tieleman 8a0cc68f6e Move 1.0 (archs) build loop to separate file and add 1.1 (targets) build loop 2016-11-06 12:20:48 +01:00
Anton Tieleman da61c4b088 Add OpenSSL config file for 1.1.0 build 2016-11-06 12:20:48 +01:00
Anton Tieleman 8709045b25 Move generic parts of build loop to functions 2016-11-06 12:20:48 +01:00
Anton Tieleman c683e1b3d8 Prepare for 1.1.0 build (amended)
- Prepare (command line) options
- Prepare script output for parallel 1.0.2/1.1.0 Travis build
- Show number of make threads
- cd to correct dir before removing source to prevent errors
2016-11-06 12:20:27 +01:00
Stephen Hinton 55c1f5bc15 OpenSSL 1.0.2j 2016-09-28 14:53:30 -05:00
Felix Schulze 74f5df8064 Merge branch 'master' into openssl-1.0.2i 2016-09-22 13:50:57 +02:00
Felix Schulze 3a7bc677ef OpenSSL 1.0.2i 2016-09-22 13:22:31 +02:00
Anton Tieleman 7c1e6c86d5 Check for errors in archive download, fix --version, whitespace consistency 2016-09-19 19:59:20 +02:00
Anton Tieleman 955b3df8bb Add branch option for building the latest version of a branch.
Use github API to determine latest version and verify download archive availability afterwards.
2016-09-18 23:19:23 +02:00
Anton Tieleman 1d9c392864 Review comments
- Maintain fixed default version in script
- Add --cleanup option for concious cleanup before building and remove directory-check
- Remove (for now) option to build latest version
2016-09-18 17:34:44 +02:00
Anton Tieleman 1967594392 Specify build configuration with command line parameters
- Added help message
- Command line arguments processing
- Retrieve latest version from 1.0.2 branch in case no version is specified
- Use script location as working dir
- Add summary of build options
- Clean up directories before build
2016-09-18 16:14:11 +02:00
Anton Tieleman 477160b2c9 Build loop updates
- Increase script 'safety' by checking for undefined variables
- Add comments, remove unused variables
- Align name of SOURCEDIR var with other vars
- Add compiler arguments and defines to LOCAL_CONFIG_OPTIONS where possible
- Remove change to ui_openssl.c since sig_atomic_t is now defined in the iOS SDK (also checked for 7.1) and removing it shows a compiler warning (ui_openssl.c:410:17: warning: type specifier missing, defaults to 'int' [-Wimplicit-int])
- Only add -isysroot option to Darwin builds since it is part of the compiler arguments for the iphoneos-cross target
2016-09-18 13:27:10 +02:00
Anton Tieleman c704379151 Parallel build (make -j) 2016-09-18 12:15:15 +02:00
Anton Tieleman 87982691e2 Move ARCHS to config section and add documentation 2016-09-18 11:28:27 +02:00
Anton Tieleman 40f636f7f9 Merge changes from upstream/master 2016-09-18 11:26:46 +02:00
Anton Tieleman 74c4341f71 Fix error handling for non-verbose mode, add verbose-on-error
- Error handling was broken since spinner() did not return the status of the command that was executed.
- New option verbose-on-error to limit output, but still log in case of errors (for Travis builds)
- Check for errors during make depend
- Also log to file for verbose builds
- Remove make clean since the full build directory is removed anyway
- Make spinner cursor less nervous
2016-09-18 00:34:08 +02:00
Anton Tieleman 0f2afa24af Allow build of subset of archs: make lipo arguments dynamic and copy include files from first built ARCH 2016-09-17 14:54:55 +02:00