From ce5850b4cded581081ed1cd65940f12e84802ef3 Mon Sep 17 00:00:00 2001 From: Arenoros Date: Tue, 25 May 2021 21:31:04 +0300 Subject: [PATCH] (#3998) add libatomic in build dependency for Neutrino OS --- recipes/openssl/1.x.x/conanfile.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/openssl/1.x.x/conanfile.py b/recipes/openssl/1.x.x/conanfile.py index c6c3473a6b1fae..5326e4cc00feb8 100644 --- a/recipes/openssl/1.x.x/conanfile.py +++ b/recipes/openssl/1.x.x/conanfile.py @@ -491,8 +491,7 @@ def _configure_args(self): else: args.append("-fPIC" if self.options.get_safe("fPIC", True) else "no-pic") if self.settings.os == "Neutrino": - args.append("-lsocket no-asm") - + args.append("no-asm -lsocket -latomic") if self._full_version < "1.1.0": if self.options.get_safe("no_zlib"): args.append("no-zlib") @@ -872,7 +871,9 @@ def package_info(self): if not self.options.no_threads: self.cpp_info.components["crypto"].system_libs.append("pthread") self.cpp_info.components["ssl"].system_libs.append("pthread") - + elif self.settings.os == "Neutrino": + self.cpp_info.components["crypto"].system_libs.append("atomic") + self.cpp_info.components["ssl"].system_libs.append("atomic") self.cpp_info.components["crypto"].names["cmake_find_package"] = "Crypto" self.cpp_info.components["crypto"].names["cmake_find_package_multi"] = "Crypto" self.cpp_info.components["crypto"].names['pkg_config'] = 'libcrypto'