Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libsodium: update to msys2/20190524 #857

Merged
merged 1 commit into from
Feb 13, 2020
Merged

libsodium: update to msys2/20190524 #857

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions recipes/libsodium/1.0.18/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ def config_options(self):

def build_requirements(self):
# There are several unix tools used (bash scripts for Emscripten, autoreconf on MinGW, etc...)
if tools.os_info.is_windows:
self.build_requires("msys2/20161025")
if self.settings.compiler != "Visual Studio" and tools.os_info.is_windows and \
not "CONAN_BASH_PATH" in os.environ and tools.os_info.detect_windows_subsystem() != "Windows":
self.build_requires("msys2/20190524")

def source(self):
tools.get(**self.conan_data["sources"][self.version])
Expand Down Expand Up @@ -115,7 +116,7 @@ def _build_autotools_darwin(self, configure_args):
host_arch = "%s-apple-%s" % (self.settings.arch, os)
configure_args.append("--host=%s" % host_arch)
self._build_autotools_impl(configure_args)

def _build_autotools_neutrino(self, configure_args):
neutrino_archs = {"x86_64":"x86_64-pc", "x86":"i586-pc", "armv7":"arm-unknown", "armv8": "aarch64-unknown"}
if self.settings.os.version == "7.0" and str(self.settings.arch) in neutrino_archs:
Expand Down