diff --git a/recipes/wasmtime/all/conandata.yml b/recipes/wasmtime/all/conandata.yml index 439965376359d2..a510977a9d94a4 100644 --- a/recipes/wasmtime/all/conandata.yml +++ b/recipes/wasmtime/all/conandata.yml @@ -1,2 +1,2 @@ sources: - "0.28.0": "" \ No newline at end of file + "0.28.0": "" diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index 048dfb779dc7b4..8b20346d0c9907 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -13,9 +13,11 @@ class WasmtimeConan(ConanFile): settings = "os", "compiler", "build_type", "arch" options = { "shared": [True, False], + 'fPIC': [True], } default_options = { 'shared': False, + 'fPIC': True, } generators = "cmake", "cmake_find_package", "cmake_find_package_multi" exports_sources = ['CMakeLists.txt', 'patches/*'] @@ -26,23 +28,15 @@ class WasmtimeConan(ConanFile): def _source_subfolder(self): return "source_subfolder" - @property - def _minimum_cpp_standard(self): - return 11 - - @property - def _minimum_compilers_version(self): - return { - "Visual Studio": "15", - "apple-clang": "9.4", - "clang": "3.3", - "gcc": "4.9.4" - } - def build(self): try: - archive_ext = "zip" if self.settings.os == "Windows" else "tar.xz" - url = f"https://github.com/bytecodealliance/wasmtime/releases/download/v{self.version}/wasmtime-v{self.version}-{self.settings.arch}-{str(self.settings.os).lower()}-c-api.{archive_ext}" + if self.settings.arch == "aarch64" and self.settings.os == "Android": + os_name = "Linux" + else: + os_name = str(self.settings.os) + + archive_ext = "zip" if os_name == "Windows" else "tar.xz" + url = f"https://github.com/bytecodealliance/wasmtime/releases/download/v{self.version}/wasmtime-v{self.version}-{self.settings.arch}-{os_name.lower()}-c-api.{archive_ext}" tools.get(url, strip_root=True, destination=self._source_subfolder) except: raise Exception("Binary does not exist for these settings")