Commit Graph

252 Commits

Author SHA1 Message Date
Felix Schulze f28e63c656 Merge branch 'master' into master 2017-03-15 10:38:43 +01:00
g4bor k0vacs db8e598554 Allow to disable embedding Bitcode for OpenSSL 1.1.0+ too 2017-03-13 02:20:27 +01:00
Felix Schulze 4dae1f0680 Merge pull request #141 from andrewh42/master
openssl 1.1.x's default configuration results in app store rejection
2017-03-10 09:20:58 +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
Andrew H ec6846add1 Merge branch 'master' into master 2017-03-06 20:21:26 +11:00
Andrew Herbert addf784317 No need for --async build option 2017-03-06 09:31:01 +11:00
Felix Schulze f5f3bee244 Merge pull request #142 from oneton/opensslconf-2
Use a per-architecture opensslconf.h (#126 take 3)
2017-03-04 16:48:30 +01:00
Anton Tieleman 9a9119669b Preprocessor error for unknown targets and include for TargetConditionals.h 2017-03-04 13:06:21 +01:00
Andrew Herbert ee1cea7cd4 openssl 1.1.x's default configuration results in app store rejection: The app references non-public symbols in <app name>: _getcontext, _makecontext, _setcontext 2017-03-03 14:42:09 +11: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
Felix Schulze f9a1f18f3a Merge pull request #138 from oneton/openssl-1_1_0e
OpenSSL 1.1.0e
2017-02-17 09:37:53 +01:00
Anton Tieleman 1709539784 OpenSSL 1.1.0e 2017-02-16 20:50:55 +01:00
Felix Schulze cdcb454173 Merge pull request #137 from oneton/source-openssl
Download from openssl.org
2017-02-04 08:19:39 +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
Felix Schulze a28578a337 Merge pull request #135 from oneton/openssl-1_0_2k-1_1_0d
OpenSSL 1.0.2k and 1.1.0d + Travis build with Xcode 8.2
2017-01-28 08:31:13 +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
Felix Schulze f11efc9224 Merge pull request #129 from oneton/1.1.0c
Update default 1.1.0 build to OpenSSL 1.1.0c
2016-11-13 13:59:04 +01:00
Anton Tieleman 4bc1646956 OpenSSL 1.1.0c 2016-11-13 12:17:35 +01:00
Felix Schulze bb8c2ae695 Update README.md 2016-11-07 17:25:54 +01:00
Felix Schulze 01cd924cfe Update README.md 2016-11-07 17:21:28 +01:00
Felix Schulze 3b971c6658 Merge pull request #128 from oneton/1.1.0-build-cleaned
Allow building OpenSSL 1.1.0 (clean branch)
2016-11-07 17:18:10 +01:00
Anton Tieleman 34490f8f39 New Travis build script for parallel 1.0 / 1.1 build 2016-11-06 12:20:48 +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
Felix Schulze cce9b09d10 Merge pull request #121 from stehin/openssl-1.0.2j
OpenSSL 1.0.2j
2016-09-29 17:08:37 +02:00
Stephen Hinton 3fbca9aee8 doesn't contains -> doesn't contain 2016-09-28 14:54:59 -05:00
Stephen Hinton 55c1f5bc15 OpenSSL 1.0.2j 2016-09-28 14:53:30 -05:00
Felix Schulze 2277fde10d Merge pull request #119 from x2on/openssl-1.0.2i
OpenSSL 1.0.2i
2016-09-22 14:30:11 +02:00
Felix Schulze 74f5df8064 Merge branch 'master' into openssl-1.0.2i 2016-09-22 13:50:57 +02:00
Felix Schulze cfedc3a9b1 Merge pull request #118 from oneton/1.0.2-branch-option
--branch option: download/build latest release in specific branch
2016-09-22 13:50:49 +02:00
Felix Schulze 80ab1cc995 Update README.md 2016-09-22 13:23:04 +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
Felix Schulze 0b6aaa865a Merge pull request #117 from x2on/framework-bitcode-check
Add check for bitcode
2016-09-18 21:43:44 +02:00
Felix Schulze 1d27fe814e Merge branch 'master' into framework-bitcode-check 2016-09-18 20:08:32 +02:00
Felix Schulze 0562fc6c61 Add check for bitcode 2016-09-18 20:07:59 +02:00
Felix Schulze ac9f3c2202 Update README.md 2016-09-18 19:57:36 +02:00
Felix Schulze 48e6942d79 Merge pull request #116 from oneton/1.0.2-command-line
Specify build configuration with command line parameters
2016-09-18 19:53:27 +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 98738414bb Command line options for Travis build.
Added no parallel due to PR #115
2016-09-18 16:15:39 +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
Felix Schulze 24500d89b9 Merge pull request #115 from oneton/1.0.2-configure
Build loop: minimise file edits (use Configure options instead) and minor style changes
2016-09-18 15:07:08 +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