diff --git a/recipes/openssl/3.x.x/conanfile.py b/recipes/openssl/3.x.x/conanfile.py index afcc879ec24a9..ee37a184080f4 100644 --- a/recipes/openssl/3.x.x/conanfile.py +++ b/recipes/openssl/3.x.x/conanfile.py @@ -346,7 +346,7 @@ def _ancestor_target(self): return ancestor def _get_default_openssl_dir(self): - if self.settings.os == "Linux": + if self.settings.os in ["Linux", "Neutrino"]: return "/etc/ssl" return os.path.join(self.package_folder, "res") @@ -440,6 +440,7 @@ def _create_targets(self, cflags, cxxflags, defines, ldflags): cxxflags => add("{cxxflags}"), {defines} lflags => add("{lflags}"), + {dso_scheme} {shared_target} {shared_cflag} {shared_extension} @@ -448,13 +449,16 @@ def _create_targets(self, cflags, cxxflags, defines, ldflags): ); """) + dso_scheme = "" + if self.settings.os == "Neutrino": + dso_scheme = 'dso_scheme => "dlfcn",' + perlasm_scheme = "" if self._perlasm_scheme: perlasm_scheme = 'perlasm_scheme => "%s",' % self._perlasm_scheme - defines = " ".join(defines) - defines = 'defines => add("%s"),' % defines if defines else "" - targets = "my %targets" + defines = "\n".join(f"defines => add(\"{d}\")," for d in defines) + targets = "my %targets" if self._asm_target: ancestor = '[ "%s", asm("%s") ]' % (self._ancestor_target, self._asm_target) @@ -482,6 +486,7 @@ def _create_targets(self, cflags, cxxflags, defines, ldflags): cxxflags=" ".join(cxxflags), defines=defines, perlasm_scheme=perlasm_scheme, + dso_scheme=dso_scheme, shared_target=shared_target, shared_extension=shared_extension, shared_cflag=shared_cflag,