Fix OpenSSL versions 1.1.1 & newer for tvOS #1586
+56
−2
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -96,6 +96,7 @@ class OpenSSLConan(ConanFile): | |
| default_options["openssldir"] = None | ||
| _env_build = None | ||
| _source_subfolder = "source_subfolder" | ||
| exports_sources = ['patches/*'] | ||
|
|
||
| def build_requirements(self): | ||
| if tools.os_info.is_windows: | ||
|
|
@@ -413,6 +414,8 @@ def _configure_args(self): | |
| if self._full_version >= "1.1.0": | ||
| args.append("--debug" if self.settings.build_type == "Debug" else "--release") | ||
|
|
||
| if str(self.settings.os) == "tvOS": | ||
| args.append(" -DNO_FORK") # fork is not available on tvOS | ||
| if str(self.settings.os) == "Android": | ||
| args.append(" -D__ANDROID_API__=%s" % str(self.settings.os.api_level)) # see NOTES.ANDROID | ||
| if str(self.settings.os) == "Emscripten": | ||
|
|
@@ -603,6 +606,9 @@ def build(self): | |
| env_vars["CROSS_TOP"] = os.path.dirname(os.path.dirname(xcrun.sdk_path)) | ||
| with tools.environment_append(env_vars): | ||
| if self._full_version >= "1.1.0": | ||
| if self.settings.os == "tvOS": | ||
| tools.patch(patch_file=os.path.join("patches", "1.1.1-tvos.patch"), | ||
| base_path=self._source_subfolder) | ||
|
Comment on lines
+609
to
+611
There was a problem hiding this comment. I don't like the conditional patching. There was a problem hiding this comment. Considering this is the patch that is being used as the fix for this in the official OpenSSL repository, I don't think that makes sense. Furthermore, since even if you pass |
||
| self._create_targets() | ||
| else: | ||
| self._patch_makefile_org() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| --- apps/speed.c | ||
| +++ apps/speed.c | ||
| @@ -99,6 +99,13 @@ | ||
| #endif | ||
| #include <openssl/modes.h> | ||
|
|
||
| +/* fork() breaks AppleTVOS, WatchOS, AppleTVSimulator and WatchSimulator */ | ||
| +/* Users should configure with -DNO_FORK */ | ||
| +#if defined(NO_FORK) | ||
| +# undef HAVE_FORK | ||
| +# define HAVE_FORK 0 | ||
| +#endif | ||
| + | ||
| #ifndef HAVE_FORK | ||
| # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VXWORKS) | ||
| # define HAVE_FORK 0 | ||
| @@ -110,6 +117,7 @@ | ||
| #if HAVE_FORK | ||
| # undef NO_FORK | ||
| #else | ||
| +# undef NO_FORK | ||
| # define NO_FORK | ||
| #endif | ||
|
|
||
| --- apps/ocsp.c | ||
| +++ apps/ocsp.c | ||
| @@ -36,6 +36,13 @@ | ||
| # include <openssl/x509v3.h> | ||
| # include <openssl/rand.h> | ||
|
|
||
| +/* fork() breaks AppleTVOS, WatchOS, AppleTVSimulator and WatchSimulator */ | ||
| +/* Users should configure with -DNO_FORK */ | ||
| +#if defined(NO_FORK) | ||
| +# undef HAVE_FORK | ||
| +# define HAVE_FORK 0 | ||
| +#endif | ||
| + | ||
| #ifndef HAVE_FORK | ||
| # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) | ||
| # define HAVE_FORK 0 | ||
| @@ -47,6 +54,7 @@ | ||
| #if HAVE_FORK | ||
| # undef NO_FORK | ||
| #else | ||
| +# undef NO_FORK | ||
| # define NO_FORK | ||
| #endif | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this is changed, then the rest of the
if self.settings.os ==statements that follow should also be changed. I didn't notice it before, but the usage of this is horribly inconsistent though the entire recipe. Is there a standardization somewhere that says one should be used over the other? I typically don't do "standardization" type changes for commits for things like this, but I'm happy to do it if you'd prefer it.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
By dropping the
str,conanis able to check whethertvOSis a valid os.That way typos can be catched.
If the code is equivalent, I'ld say 'why not?'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, it doesn't matter to me one way or the other - I suck at Python & honestly don't know the difference.
Just because I'm curious and would like to know - how is it that Conan can check if it's a valid OS by doing
self.settings.osrather thanstr(self.settings.os)? Ifself.settings.osis a string, then usingstr()really just turns an existing string into a string, right?Maybe a better way to put it is - how is it that dropping
str()makes it so Conan can check iftvOSis a valid OS?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When you compare against
self.settings.os, you're comparing against aSettingsItemobject.This class checks whether strings to which it is compared against would also be a valid setting (ie it is present in your settings.yml file).
By doing
str, you compare against a string without an additional check.