diff options
| author | Vincenzo Bono <vincenzo.bono@gmail.com> | 2018-06-26 20:43:29 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-06-29 17:38:05 +0530 |
| commit | ee85f44c7f5faf4b0479ac7427d4be617d4b6726 (patch) | |
| tree | 1a2f3c2160ac5622ba6718af45a306c7d4cf3a73 /recipes/openssl.recipe | |
| parent | 63302a7a7d6416d8a3566f0e7048237454785339 (diff) | |
cerbero: openssl.recipe patch
Added Platform.Linux in or to Platform.android, before the check for Architecture.ARMv7.
https://bugzilla.gnome.org/show_bug.cgi?id=796684
Diffstat (limited to 'recipes/openssl.recipe')
| -rw-r--r-- | recipes/openssl.recipe | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/recipes/openssl.recipe b/recipes/openssl.recipe index 77939bb4..b9914dcf 100644 --- a/recipes/openssl.recipe +++ b/recipes/openssl.recipe @@ -91,8 +91,7 @@ class Recipe(recipe.Recipe): self.make_install = 'make install_sw' # We probably don't need and can't use the tools on these platforms - if self.config.target_platform == Platform.IOS or \ - self.config.target_platform == Platform.ANDROID: + if self.config.target_platform in (Platform.IOS, Platform.ANDROID): self.make += ' build_libs openssl.pc libssl.pc libcrypto.pc' self.make_install = 'make install_dev' @@ -118,7 +117,7 @@ class Recipe(recipe.Recipe): else: config_sh += ' shared ' - if self.config.target_platform == Platform.ANDROID: + if self.config.target_platform in (Platform.ANDROID, Platform.LINUX): if self.config.target_arch == Architecture.ARMv7: # Openssl can't seem to figure this out anymore config_sh += ' -D__ARM_MAX_ARCH__=7 ' |