Skip to content

Commit

Permalink
(conan-io#3998) add libatomic in build dependency for Neutrino OS
Browse files Browse the repository at this point in the history
  • Loading branch information
Arenoros authored and madebr committed Jun 21, 2021
1 parent af952db commit ce5850b
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions recipes/openssl/1.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit ce5850b

Please sign in to comment.