From 455e9a4cea0a5696880a5e8ea2b68fa363691877 Mon Sep 17 00:00:00 2001 From: redradist Date: Tue, 29 Jun 2021 12:12:24 +0300 Subject: [PATCH 01/23] Initial support for wasmtime package --- recipes/wasmtime/all/CMakeLists.txt | 7 ++ recipes/wasmtime/all/conandata.yml | 2 + recipes/wasmtime/all/conanfile.py | 79 +++++++++++++++++++ .../wasmtime/all/test_package/CMakeLists.txt | 13 +++ .../wasmtime/all/test_package/conanfile.py | 17 ++++ recipes/wasmtime/all/test_package/example.cpp | 10 +++ recipes/wasmtime/config.yml | 3 + 7 files changed, 131 insertions(+) create mode 100644 recipes/wasmtime/all/CMakeLists.txt create mode 100644 recipes/wasmtime/all/conandata.yml create mode 100644 recipes/wasmtime/all/conanfile.py create mode 100644 recipes/wasmtime/all/test_package/CMakeLists.txt create mode 100644 recipes/wasmtime/all/test_package/conanfile.py create mode 100644 recipes/wasmtime/all/test_package/example.cpp create mode 100644 recipes/wasmtime/config.yml diff --git a/recipes/wasmtime/all/CMakeLists.txt b/recipes/wasmtime/all/CMakeLists.txt new file mode 100644 index 0000000000000..bd3083b512cb9 --- /dev/null +++ b/recipes/wasmtime/all/CMakeLists.txt @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 3.1) +project(cmake_wrapper) + +include(conanbuildinfo.cmake) +conan_basic_setup() + +add_subdirectory(source_subfolder) diff --git a/recipes/wasmtime/all/conandata.yml b/recipes/wasmtime/all/conandata.yml new file mode 100644 index 0000000000000..a510977a9d94a --- /dev/null +++ b/recipes/wasmtime/all/conandata.yml @@ -0,0 +1,2 @@ +sources: + "0.28.0": "" diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py new file mode 100644 index 0000000000000..465b5c6b2b82a --- /dev/null +++ b/recipes/wasmtime/all/conanfile.py @@ -0,0 +1,79 @@ +from conans import ConanFile, CMake, tools +from conans.errors import ConanInvalidConfiguration, ConanException +import os + + +class WasmtimeConan(ConanFile): + name = 'wasmtime' + homepage = 'https://github.com/bytecodealliance/wasmtime' + license = 'Apache License 2.0' + url = 'https://github.com/conan-io/conan-center-index' + description = "Standalone JIT-style runtime for WebAssembly, using Cranelift" + topics = ("webassembly", "wasm", "wasi") + 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/*'] + + @property + def _source_subfolder(self): + return "source_subfolder" + + def config_options(self): + if self.settings.os == 'Windows': + del self.options.fPIC + + def configure(self): + if self.options.shared: + del self.options.fPIC + + def build(self): + try: + if self.settings.arch == "armv8" 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") + + def package(self): + include_path = os.path.join(self._source_subfolder, 'include') + self.copy('*.h', dst='include', src=include_path) + self.copy('*.hh', dst='include', src=include_path) + self.copy('*.hpp', dst='include', src=include_path) + + self.copy('*.lib', dst='lib', keep_path=False) + self.copy('*.dll', dst='bin', keep_path=False) + self.copy('*.so', dst='lib', keep_path=False) + self.copy('*.dylib', dst='lib', keep_path=False) + self.copy('*.a', dst='lib', keep_path=False) + + self.copy('LICENSE', dst='licenses', src=self._source_subfolder) + + def package_info(self): + self.cpp_info.names["cmake_find_package"] = "wasmtime" + self.cpp_info.names["cmake_find_multi_package"] = "wasmtime" + if self.options.shared: + self.cpp_info.libs = ["wasmtime.dll"] + else: + if self.settings.os == "Windows": + self.cpp_info.defines= ["/DWASM_API_EXTERN=", "/DWASI_API_EXTERN="] + self.cpp_info.libs = ["wasmtime"] + else: + self.cpp_info.libs = ["wasmtime"] + + if self.settings.os == 'Windows': + self.cpp_info.system_libs = ['ws2_32', 'bcrypt', 'advapi32', 'userenv', 'ntdll', 'shell32', 'ole32'] + if self.settings.os == 'Linux': + self.cpp_info.system_libs = ['pthread', 'dl', 'm'] diff --git a/recipes/wasmtime/all/test_package/CMakeLists.txt b/recipes/wasmtime/all/test_package/CMakeLists.txt new file mode 100644 index 0000000000000..34e41c7181be9 --- /dev/null +++ b/recipes/wasmtime/all/test_package/CMakeLists.txt @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 3.1) +project(PackageTest) + +set(CMAKE_CXX_STANDARD 11) + +include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +conan_basic_setup() + +find_package(wasmtime REQUIRED) + +add_executable(example example.cpp) +target_link_libraries(example PRIVATE wasmtime::wasmtime) +target_compile_options(example PRIVATE ${CONAN_COMPILE_DEFINITIONS_WASMTIME}) diff --git a/recipes/wasmtime/all/test_package/conanfile.py b/recipes/wasmtime/all/test_package/conanfile.py new file mode 100644 index 0000000000000..b92626c3778c4 --- /dev/null +++ b/recipes/wasmtime/all/test_package/conanfile.py @@ -0,0 +1,17 @@ +from conans import ConanFile, CMake, tools +import os + + +class WasmtimeTestConan(ConanFile): + settings = 'os', 'compiler', 'build_type', 'arch' + generators = 'cmake', 'cmake_find_package' + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if not tools.cross_building(self.settings): + bin_path = os.path.join('bin', 'example') + self.run(bin_path, run_environment=True) diff --git a/recipes/wasmtime/all/test_package/example.cpp b/recipes/wasmtime/all/test_package/example.cpp new file mode 100644 index 0000000000000..dc458016aa625 --- /dev/null +++ b/recipes/wasmtime/all/test_package/example.cpp @@ -0,0 +1,10 @@ +#include +#include + +int main() { + auto wat = ""; + wasm_byte_vec_t ret; + auto *error = wasmtime_wat2wasm(wat, sizeof(wat), &ret); + std::this_thread::sleep_for(std::chrono::seconds(1)); + return 0; +} diff --git a/recipes/wasmtime/config.yml b/recipes/wasmtime/config.yml new file mode 100644 index 0000000000000..e64ed6c037d2c --- /dev/null +++ b/recipes/wasmtime/config.yml @@ -0,0 +1,3 @@ +versions: + "0.28.0": + folder: all From 15736c9b6e7b0447507aa76ec38cb7d789f036cf Mon Sep 17 00:00:00 2001 From: redradist Date: Sat, 3 Jul 2021 13:33:06 +0300 Subject: [PATCH 02/23] Fixed build package on Linux --- recipes/wasmtime/all/conanfile.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index 465b5c6b2b82a..8b5e506824491 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -65,13 +65,14 @@ def package_info(self): self.cpp_info.names["cmake_find_package"] = "wasmtime" self.cpp_info.names["cmake_find_multi_package"] = "wasmtime" if self.options.shared: - self.cpp_info.libs = ["wasmtime.dll"] - else: if self.settings.os == "Windows": - self.cpp_info.defines= ["/DWASM_API_EXTERN=", "/DWASI_API_EXTERN="] - self.cpp_info.libs = ["wasmtime"] + self.cpp_info.libs = ["wasmtime.dll"] else: self.cpp_info.libs = ["wasmtime"] + else: + if self.settings.os == "Windows": + self.cpp_info.defines= ["/DWASM_API_EXTERN=", "/DWASI_API_EXTERN="] + self.cpp_info.libs = ["wasmtime"] if self.settings.os == 'Windows': self.cpp_info.system_libs = ['ws2_32', 'bcrypt', 'advapi32', 'userenv', 'ntdll', 'shell32', 'ole32'] From 30ad84cf88953ce1a653053f87cee83cc43423b3 Mon Sep 17 00:00:00 2001 From: redradist Date: Sun, 4 Jul 2021 12:32:21 +0300 Subject: [PATCH 03/23] Updates according the comments in review #0 --- recipes/wasmtime/all/CMakeLists.txt | 7 ------- recipes/wasmtime/all/conandata.yml | 21 ++++++++++++++++++++- recipes/wasmtime/all/conanfile.py | 25 +++++++++---------------- 3 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 recipes/wasmtime/all/CMakeLists.txt diff --git a/recipes/wasmtime/all/CMakeLists.txt b/recipes/wasmtime/all/CMakeLists.txt deleted file mode 100644 index bd3083b512cb9..0000000000000 --- a/recipes/wasmtime/all/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(cmake_wrapper) - -include(conanbuildinfo.cmake) -conan_basic_setup() - -add_subdirectory(source_subfolder) diff --git a/recipes/wasmtime/all/conandata.yml b/recipes/wasmtime/all/conandata.yml index a510977a9d94a..73fabac21805d 100644 --- a/recipes/wasmtime/all/conandata.yml +++ b/recipes/wasmtime/all/conandata.yml @@ -1,2 +1,21 @@ sources: - "0.28.0": "" + "0.28.0": + Windows: + "x86_64": + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-x86_64-windows-c-api.zip" + sha256: "9bc1c2dad2a281efb3b4c577c12b02f15b80e1c95e9f7cf1512895b469ca3ce4" + Linux: + "x86_64": + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-x86_64-linux-c-api.tar.xz" + sha256: "1ebc4f49fe80f775318d60720a44bc9157049ec0c63f01b7dc25483413f80b56" + "armv8": + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-aarch64-linux-c-api.tar.xz" + sha256: "c752db1793cd3f95a4d760661b7e201a5a799a289c71d3fcff1b4f8670aaab16" + Macos: + "x86_64": + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-x86_64-macos-c-api.tar.xz" + sha256: "b8013ff01e928555b909dccdca7a8f10a466c949811d4e054bee8ef2950c753b" + Android: + "armv8": + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-aarch64-linux-c-api.tar.xz" + sha256: "c752db1793cd3f95a4d760661b7e201a5a799a289c71d3fcff1b4f8670aaab16" diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index 465b5c6b2b82a..d980497e20ea9 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -10,7 +10,7 @@ class WasmtimeConan(ConanFile): url = 'https://github.com/conan-io/conan-center-index' description = "Standalone JIT-style runtime for WebAssembly, using Cranelift" topics = ("webassembly", "wasm", "wasi") - settings = "os", "compiler", "build_type", "arch" + settings = "os", "arch" options = { "shared": [True, False], 'fPIC': [True], @@ -19,8 +19,7 @@ class WasmtimeConan(ConanFile): 'shared': False, 'fPIC': True, } - generators = "cmake", "cmake_find_package", "cmake_find_package_multi" - exports_sources = ['CMakeLists.txt', 'patches/*'] + no_copy_source = True @property def _source_subfolder(self): @@ -34,18 +33,14 @@ def configure(self): if self.options.shared: del self.options.fPIC - def build(self): - try: - if self.settings.arch == "armv8" and self.settings.os == "Android": - os_name = "Linux" - else: - os_name = str(self.settings.os) + def validate(self): + if (not (self.version in self.conan_data["sources"]) or + not (str(self.settings.os) in self.conan_data["sources"][self.version]) or + not (str(self.settings.arch) in self.conan_data["sources"][self.version][str(self.settings.os)] ) ): + raise ConanInvalidConfiguration("Binaries for this combination of architecture/version/os not available") - 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") + def build(self): + tools.get(**self.conan_data["sources"][self.version][str(self.settings.os)][str(self.settings.arch)], destination=self._source_subfolder, strip_root=True) def package(self): include_path = os.path.join(self._source_subfolder, 'include') @@ -62,8 +57,6 @@ def package(self): self.copy('LICENSE', dst='licenses', src=self._source_subfolder) def package_info(self): - self.cpp_info.names["cmake_find_package"] = "wasmtime" - self.cpp_info.names["cmake_find_multi_package"] = "wasmtime" if self.options.shared: self.cpp_info.libs = ["wasmtime.dll"] else: From 326e85d38eaedd10612602201d93da506e67470c Mon Sep 17 00:00:00 2001 From: Denis Date: Sun, 4 Jul 2021 12:42:17 +0300 Subject: [PATCH 04/23] Update recipes/wasmtime/all/conanfile.py Update license type Co-authored-by: Chris Mc --- recipes/wasmtime/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index d5a517f86ef0f..67e0a949dc03d 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -6,7 +6,7 @@ class WasmtimeConan(ConanFile): name = 'wasmtime' homepage = 'https://github.com/bytecodealliance/wasmtime' - license = 'Apache License 2.0' + license = 'Apache-2.0' url = 'https://github.com/conan-io/conan-center-index' description = "Standalone JIT-style runtime for WebAssembly, using Cranelift" topics = ("webassembly", "wasm", "wasi") From 43445ea8d91ec8fec328a594ecb1e8bf8b4ca8b2 Mon Sep 17 00:00:00 2001 From: redradist Date: Mon, 5 Jul 2021 00:21:40 +0300 Subject: [PATCH 05/23] Updates according the comments in review #1 --- recipes/wasmtime/all/test_package/CMakeLists.txt | 4 +--- recipes/wasmtime/all/test_package/example.c | 8 ++++++++ recipes/wasmtime/all/test_package/example.cpp | 10 ---------- 3 files changed, 9 insertions(+), 13 deletions(-) create mode 100644 recipes/wasmtime/all/test_package/example.c delete mode 100644 recipes/wasmtime/all/test_package/example.cpp diff --git a/recipes/wasmtime/all/test_package/CMakeLists.txt b/recipes/wasmtime/all/test_package/CMakeLists.txt index 34e41c7181be9..bbe3853ebef61 100644 --- a/recipes/wasmtime/all/test_package/CMakeLists.txt +++ b/recipes/wasmtime/all/test_package/CMakeLists.txt @@ -1,13 +1,11 @@ cmake_minimum_required(VERSION 3.1) project(PackageTest) -set(CMAKE_CXX_STANDARD 11) - include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup() find_package(wasmtime REQUIRED) -add_executable(example example.cpp) +add_executable(example example.c) target_link_libraries(example PRIVATE wasmtime::wasmtime) target_compile_options(example PRIVATE ${CONAN_COMPILE_DEFINITIONS_WASMTIME}) diff --git a/recipes/wasmtime/all/test_package/example.c b/recipes/wasmtime/all/test_package/example.c new file mode 100644 index 0000000000000..7798660541456 --- /dev/null +++ b/recipes/wasmtime/all/test_package/example.c @@ -0,0 +1,8 @@ +#include + +int main() { + char* wat = ""; + wasm_byte_vec_t ret; + wasmtime_error_t *error = wasmtime_wat2wasm(wat, sizeof(wat), &ret); + return 0; +} diff --git a/recipes/wasmtime/all/test_package/example.cpp b/recipes/wasmtime/all/test_package/example.cpp deleted file mode 100644 index dc458016aa625..0000000000000 --- a/recipes/wasmtime/all/test_package/example.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - -int main() { - auto wat = ""; - wasm_byte_vec_t ret; - auto *error = wasmtime_wat2wasm(wat, sizeof(wat), &ret); - std::this_thread::sleep_for(std::chrono::seconds(1)); - return 0; -} From 45b7d0004d411fd329256236b869680596ee34db Mon Sep 17 00:00:00 2001 From: redradist Date: Mon, 5 Jul 2021 00:29:48 +0300 Subject: [PATCH 06/23] Updates according the comments in review #2 --- recipes/wasmtime/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index 67e0a949dc03d..08f95c1e093f0 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -39,7 +39,7 @@ def validate(self): not (str(self.settings.arch) in self.conan_data["sources"][self.version][str(self.settings.os)] ) ): raise ConanInvalidConfiguration("Binaries for this combination of architecture/version/os not available") - def build(self): + def source(self): tools.get(**self.conan_data["sources"][self.version][str(self.settings.os)][str(self.settings.arch)], destination=self._source_subfolder, strip_root=True) def package(self): From 7aa47caf2eedd155165fac96250fb890912d093e Mon Sep 17 00:00:00 2001 From: redradist Date: Mon, 5 Jul 2021 20:12:25 +0300 Subject: [PATCH 07/23] Updates according the comments in review #3 --- recipes/wasmtime/all/conanfile.py | 23 ++++++++++++++++++- .../wasmtime/all/test_package/CMakeLists.txt | 2 ++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index 08f95c1e093f0..4dd49d173a7ab 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -10,7 +10,7 @@ class WasmtimeConan(ConanFile): url = 'https://github.com/conan-io/conan-center-index' description = "Standalone JIT-style runtime for WebAssembly, using Cranelift" topics = ("webassembly", "wasm", "wasi") - settings = "os", "arch" + settings = "os", "compiler", "arch" options = { "shared": [True, False], 'fPIC': [True], @@ -25,6 +25,19 @@ 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 config_options(self): if self.settings.os == 'Windows': del self.options.fPIC @@ -34,6 +47,14 @@ def configure(self): del self.options.fPIC def validate(self): + compiler = self.settings.compiler + min_version = self._minimum_compilers_version[str(compiler)] + if tools.Version(compiler.version) < min_version: + msg = ( + "{} requires C{} features which are not supported by compiler {} {} !!" + ).format(self.name, self._minimum_cpp_standard, compiler, compiler.version) + raise ConanInvalidConfiguration(msg) + if (not (self.version in self.conan_data["sources"]) or not (str(self.settings.os) in self.conan_data["sources"][self.version]) or not (str(self.settings.arch) in self.conan_data["sources"][self.version][str(self.settings.os)] ) ): diff --git a/recipes/wasmtime/all/test_package/CMakeLists.txt b/recipes/wasmtime/all/test_package/CMakeLists.txt index bbe3853ebef61..374e151bc1046 100644 --- a/recipes/wasmtime/all/test_package/CMakeLists.txt +++ b/recipes/wasmtime/all/test_package/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.1) project(PackageTest) +set(C_STANDARD 11) + include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup() From dddb52dfaa0292f6ca043f87f7bf7d76b1509d71 Mon Sep 17 00:00:00 2001 From: redradist Date: Sat, 10 Jul 2021 21:53:55 +0300 Subject: [PATCH 08/23] Updates according the comments in review #4 --- recipes/wasmtime/all/conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index 4dd49d173a7ab..c0cfac3279a41 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -43,6 +43,8 @@ def config_options(self): del self.options.fPIC def configure(self): + del self.settings.compiler.libcxx + del self.settings.compiler.cppstd if self.options.shared: del self.options.fPIC From fe85d9e931cc3940c32f5d159e2ae3fabff035a9 Mon Sep 17 00:00:00 2001 From: redradist Date: Sat, 10 Jul 2021 22:11:25 +0300 Subject: [PATCH 09/23] Updates according the comments in review #5 --- recipes/wasmtime/all/conanfile.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index c0cfac3279a41..5965ffaee4fb3 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -51,11 +51,18 @@ def configure(self): def validate(self): compiler = self.settings.compiler min_version = self._minimum_compilers_version[str(compiler)] - if tools.Version(compiler.version) < min_version: + try: + if tools.Version(compiler.version) < min_version: + msg = ( + "{} requires C{} features which are not supported by compiler {} {} !!" + ).format(self.name, self._minimum_cpp_standard, compiler, compiler.version) + raise ConanInvalidConfiguration(msg) + except KeyError: msg = ( - "{} requires C{} features which are not supported by compiler {} {} !!" - ).format(self.name, self._minimum_cpp_standard, compiler, compiler.version) - raise ConanInvalidConfiguration(msg) + "{} recipe lacks information about the {} compiler, " + "support for the required C++{} features is assumed" + ).format(self.name, compiler, self._minimum_cpp_standard) + self.output.warn(msg) if (not (self.version in self.conan_data["sources"]) or not (str(self.settings.os) in self.conan_data["sources"][self.version]) or From c3a464228dfca599f96d2650e4d00fe96c390755 Mon Sep 17 00:00:00 2001 From: redradist Date: Sun, 25 Jul 2021 23:22:52 +0300 Subject: [PATCH 10/23] Next iteration of fixes --- recipes/wasmtime/all/conanfile.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index 5965ffaee4fb3..810c457d4a6c9 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -60,13 +60,13 @@ def validate(self): except KeyError: msg = ( "{} recipe lacks information about the {} compiler, " - "support for the required C++{} features is assumed" + "support for the required C{} features is assumed" ).format(self.name, compiler, self._minimum_cpp_standard) self.output.warn(msg) - if (not (self.version in self.conan_data["sources"]) or - not (str(self.settings.os) in self.conan_data["sources"][self.version]) or - not (str(self.settings.arch) in self.conan_data["sources"][self.version][str(self.settings.os)] ) ): + try: + self.conan_data["sources"][self.version][str(self.settings.os)] + except KeyError: raise ConanInvalidConfiguration("Binaries for this combination of architecture/version/os not available") def source(self): @@ -99,5 +99,5 @@ def package_info(self): if self.settings.os == 'Windows': self.cpp_info.system_libs = ['ws2_32', 'bcrypt', 'advapi32', 'userenv', 'ntdll', 'shell32', 'ole32'] - if self.settings.os == 'Linux': + elif self.settings.os == 'Linux': self.cpp_info.system_libs = ['pthread', 'dl', 'm'] From 63042236de9d87c3aabbf84d911e682bd9745697 Mon Sep 17 00:00:00 2001 From: redradist Date: Wed, 28 Jul 2021 21:07:30 +0300 Subject: [PATCH 11/23] Fixed cmake variable C_STANDARD -> CMAKE_C_STANDARD --- recipes/wasmtime/all/test_package/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wasmtime/all/test_package/CMakeLists.txt b/recipes/wasmtime/all/test_package/CMakeLists.txt index 374e151bc1046..24b9f306055b4 100644 --- a/recipes/wasmtime/all/test_package/CMakeLists.txt +++ b/recipes/wasmtime/all/test_package/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1) project(PackageTest) -set(C_STANDARD 11) +set(CMAKE_C_STANDARD 11) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup() From c75ea1a7a39c5b6bb5ee3f9b5846d695338d809e Mon Sep 17 00:00:00 2001 From: redradist Date: Wed, 28 Jul 2021 22:08:44 +0300 Subject: [PATCH 12/23] Added check on minimal version of conan --- recipes/wasmtime/all/conanfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index 810c457d4a6c9..d0a12ad141bf9 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -2,6 +2,7 @@ from conans.errors import ConanInvalidConfiguration, ConanException import os +required_conan_version = ">=1.33.0" class WasmtimeConan(ConanFile): name = 'wasmtime' From 2e49fa7e5a9aec5afda2b0a25f2a6402ef758fdf Mon Sep 17 00:00:00 2001 From: redradist Date: Mon, 2 Aug 2021 23:12:20 +0300 Subject: [PATCH 13/23] Used copytree instead of copy individual files --- recipes/wasmtime/all/conanfile.py | 15 +++++---------- recipes/wasmtime/all/test_package/CMakeLists.txt | 4 +--- recipes/wasmtime/all/test_package/conanfile.py | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index d0a12ad141bf9..8c408820d2c2f 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -1,6 +1,7 @@ from conans import ConanFile, CMake, tools from conans.errors import ConanInvalidConfiguration, ConanException import os +import shutil required_conan_version = ">=1.33.0" @@ -22,10 +23,6 @@ class WasmtimeConan(ConanFile): } no_copy_source = True - @property - def _source_subfolder(self): - return "source_subfolder" - @property def _minimum_cpp_standard(self): return 11 @@ -71,13 +68,11 @@ def validate(self): raise ConanInvalidConfiguration("Binaries for this combination of architecture/version/os not available") def source(self): - tools.get(**self.conan_data["sources"][self.version][str(self.settings.os)][str(self.settings.arch)], destination=self._source_subfolder, strip_root=True) + tools.get(**self.conan_data["sources"][self.version][str(self.settings.os)][str(self.settings.arch)], destination=self.source_folder, strip_root=True) def package(self): - include_path = os.path.join(self._source_subfolder, 'include') - self.copy('*.h', dst='include', src=include_path) - self.copy('*.hh', dst='include', src=include_path) - self.copy('*.hpp', dst='include', src=include_path) + shutil.copytree(os.path.join(self.source_folder, "include"), + os.path.join(self.package_folder, "include")) self.copy('*.lib', dst='lib', keep_path=False) self.copy('*.dll', dst='bin', keep_path=False) @@ -85,7 +80,7 @@ def package(self): self.copy('*.dylib', dst='lib', keep_path=False) self.copy('*.a', dst='lib', keep_path=False) - self.copy('LICENSE', dst='licenses', src=self._source_subfolder) + self.copy('LICENSE', dst='licenses', src=self.source_folder) def package_info(self): if self.options.shared: diff --git a/recipes/wasmtime/all/test_package/CMakeLists.txt b/recipes/wasmtime/all/test_package/CMakeLists.txt index 24b9f306055b4..cf901eaf4df34 100644 --- a/recipes/wasmtime/all/test_package/CMakeLists.txt +++ b/recipes/wasmtime/all/test_package/CMakeLists.txt @@ -6,8 +6,6 @@ set(CMAKE_C_STANDARD 11) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup() -find_package(wasmtime REQUIRED) - add_executable(example example.c) -target_link_libraries(example PRIVATE wasmtime::wasmtime) +target_link_libraries(example PRIVATE ${CONAN_LIBS}) target_compile_options(example PRIVATE ${CONAN_COMPILE_DEFINITIONS_WASMTIME}) diff --git a/recipes/wasmtime/all/test_package/conanfile.py b/recipes/wasmtime/all/test_package/conanfile.py index b92626c3778c4..7286eff9a9d92 100644 --- a/recipes/wasmtime/all/test_package/conanfile.py +++ b/recipes/wasmtime/all/test_package/conanfile.py @@ -4,7 +4,7 @@ class WasmtimeTestConan(ConanFile): settings = 'os', 'compiler', 'build_type', 'arch' - generators = 'cmake', 'cmake_find_package' + generators = 'cmake' def build(self): cmake = CMake(self) From 8af9461ec10b79176f80bc6d2347fcf5a99f2f34 Mon Sep 17 00:00:00 2001 From: redradist Date: Sat, 14 Aug 2021 12:59:26 +0300 Subject: [PATCH 14/23] Fixed the build --- recipes/wasmtime/all/conandata.yml | 4 +++ recipes/wasmtime/all/conanfile.py | 31 ++++++++++++------- .../wasmtime/all/test_package/CMakeLists.txt | 6 ++-- .../wasmtime/all/test_package/conanfile.py | 2 +- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/recipes/wasmtime/all/conandata.yml b/recipes/wasmtime/all/conandata.yml index 73fabac21805d..60fd3433304f3 100644 --- a/recipes/wasmtime/all/conandata.yml +++ b/recipes/wasmtime/all/conandata.yml @@ -4,6 +4,10 @@ sources: "x86_64": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-x86_64-windows-c-api.zip" sha256: "9bc1c2dad2a281efb3b4c577c12b02f15b80e1c95e9f7cf1512895b469ca3ce4" + MinGW: + "x86_64": + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-x86_64-mingw-c-api.zip" + sha256: "477719cf2de83121c3f3b05b9fbe6eca322ba56b9508e86322ecf73ed8085479" Linux: "x86_64": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-x86_64-linux-c-api.tar.xz" diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index 8c408820d2c2f..d126ee00c2571 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -13,14 +13,8 @@ class WasmtimeConan(ConanFile): description = "Standalone JIT-style runtime for WebAssembly, using Cranelift" topics = ("webassembly", "wasm", "wasi") settings = "os", "compiler", "arch" - options = { - "shared": [True, False], - 'fPIC': [True], - } - default_options = { - 'shared': False, - 'fPIC': True, - } + options = { "shared": [True, False] } + default_options = { 'shared': False } no_copy_source = True @property @@ -33,9 +27,17 @@ def _minimum_compilers_version(self): "Visual Studio": "15", "apple-clang": "9.4", "clang": "3.3", - "gcc": "4.9.4" + "gcc": "5.1" } + @property + def _sources_key(self): + if self.settings.compiler == "Visual Studio": + return "Windows" + elif self.settings.os == "Windows" and self.settings.compiler == "gcc": + return "MinGW" + return str(self.settings.os) + def config_options(self): if self.settings.os == 'Windows': del self.options.fPIC @@ -43,6 +45,7 @@ def config_options(self): def configure(self): del self.settings.compiler.libcxx del self.settings.compiler.cppstd + del self.settings.compiler.runtime if self.options.shared: del self.options.fPIC @@ -63,19 +66,23 @@ def validate(self): self.output.warn(msg) try: - self.conan_data["sources"][self.version][str(self.settings.os)] + self.conan_data["sources"][self.version][self._sources_key] except KeyError: raise ConanInvalidConfiguration("Binaries for this combination of architecture/version/os not available") + if (self.settings.compiler, self.settings.os) == ("gcc", "Windows") and self.options.shared: + # https://github.com/bytecodealliance/wasmtime/issues/3168 + raise ConanInvalidConfiguration("Shared mingw is currently not possible") + def source(self): - tools.get(**self.conan_data["sources"][self.version][str(self.settings.os)][str(self.settings.arch)], destination=self.source_folder, strip_root=True) + tools.get(**self.conan_data["sources"][self.version][self._sources_key][str(self.settings.arch)], destination=self.source_folder, strip_root=True) def package(self): shutil.copytree(os.path.join(self.source_folder, "include"), os.path.join(self.package_folder, "include")) - self.copy('*.lib', dst='lib', keep_path=False) self.copy('*.dll', dst='bin', keep_path=False) + self.copy('*.lib', dst='lib', keep_path=False) self.copy('*.so', dst='lib', keep_path=False) self.copy('*.dylib', dst='lib', keep_path=False) self.copy('*.a', dst='lib', keep_path=False) diff --git a/recipes/wasmtime/all/test_package/CMakeLists.txt b/recipes/wasmtime/all/test_package/CMakeLists.txt index cf901eaf4df34..1d451da128fdc 100644 --- a/recipes/wasmtime/all/test_package/CMakeLists.txt +++ b/recipes/wasmtime/all/test_package/CMakeLists.txt @@ -1,11 +1,13 @@ cmake_minimum_required(VERSION 3.1) -project(PackageTest) +project(PackageTest C) set(CMAKE_C_STANDARD 11) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup() +find_package(wasmtime REQUIRED) + add_executable(example example.c) -target_link_libraries(example PRIVATE ${CONAN_LIBS}) +target_link_libraries(example PRIVATE wasmtime::wasmtime) target_compile_options(example PRIVATE ${CONAN_COMPILE_DEFINITIONS_WASMTIME}) diff --git a/recipes/wasmtime/all/test_package/conanfile.py b/recipes/wasmtime/all/test_package/conanfile.py index 7286eff9a9d92..b92626c3778c4 100644 --- a/recipes/wasmtime/all/test_package/conanfile.py +++ b/recipes/wasmtime/all/test_package/conanfile.py @@ -4,7 +4,7 @@ class WasmtimeTestConan(ConanFile): settings = 'os', 'compiler', 'build_type', 'arch' - generators = 'cmake' + generators = 'cmake', 'cmake_find_package' def build(self): cmake = CMake(self) From 7b0b19c53845ba6f11e14a2c36133fb37692af29 Mon Sep 17 00:00:00 2001 From: redradist Date: Sat, 14 Aug 2021 16:08:42 +0300 Subject: [PATCH 15/23] Added checking for architechure in validate(...) --- recipes/wasmtime/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index d126ee00c2571..efe9f25421a0d 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -66,7 +66,7 @@ def validate(self): self.output.warn(msg) try: - self.conan_data["sources"][self.version][self._sources_key] + self.conan_data["sources"][self.version][self._sources_key][str(self.settings.arch)] except KeyError: raise ConanInvalidConfiguration("Binaries for this combination of architecture/version/os not available") From 728690cec3f3ebe2fb90d18c57bb03b6c90c038a Mon Sep 17 00:00:00 2001 From: redradist Date: Sat, 14 Aug 2021 16:56:52 +0300 Subject: [PATCH 16/23] Updated receipt for new comments from @madebr --- recipes/wasmtime/all/conanfile.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index efe9f25421a0d..c95e9a3687948 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -38,16 +38,10 @@ def _sources_key(self): return "MinGW" return str(self.settings.os) - def config_options(self): - if self.settings.os == 'Windows': - del self.options.fPIC - def configure(self): del self.settings.compiler.libcxx del self.settings.compiler.cppstd del self.settings.compiler.runtime - if self.options.shared: - del self.options.fPIC def validate(self): compiler = self.settings.compiler @@ -71,7 +65,7 @@ def validate(self): raise ConanInvalidConfiguration("Binaries for this combination of architecture/version/os not available") if (self.settings.compiler, self.settings.os) == ("gcc", "Windows") and self.options.shared: - # https://github.com/bytecodealliance/wasmtime/issues/3168 + # FIXME: https://github.com/bytecodealliance/wasmtime/issues/3168 raise ConanInvalidConfiguration("Shared mingw is currently not possible") def source(self): From 59f9c9fdd21ae585645928428fa54d2880d6ab6b Mon Sep 17 00:00:00 2001 From: redradist Date: Sat, 14 Aug 2021 17:08:12 +0300 Subject: [PATCH 17/23] Fixed calling method tools.cross_building(...) --- recipes/wasmtime/all/test_package/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wasmtime/all/test_package/conanfile.py b/recipes/wasmtime/all/test_package/conanfile.py index b92626c3778c4..a3c91f5c3e0ac 100644 --- a/recipes/wasmtime/all/test_package/conanfile.py +++ b/recipes/wasmtime/all/test_package/conanfile.py @@ -12,6 +12,6 @@ def build(self): cmake.build() def test(self): - if not tools.cross_building(self.settings): + if not tools.cross_building(self): bin_path = os.path.join('bin', 'example') self.run(bin_path, run_environment=True) From dca562bc055eaf90a77e9de0e37eba505bc354a6 Mon Sep 17 00:00:00 2001 From: redradist Date: Sun, 22 Aug 2021 23:34:03 +0300 Subject: [PATCH 18/23] Update def package(self) according the comments in review --- recipes/wasmtime/all/conanfile.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/recipes/wasmtime/all/conanfile.py b/recipes/wasmtime/all/conanfile.py index c95e9a3687948..96990538aa4a3 100644 --- a/recipes/wasmtime/all/conanfile.py +++ b/recipes/wasmtime/all/conanfile.py @@ -75,11 +75,16 @@ def package(self): shutil.copytree(os.path.join(self.source_folder, "include"), os.path.join(self.package_folder, "include")) - self.copy('*.dll', dst='bin', keep_path=False) - self.copy('*.lib', dst='lib', keep_path=False) - self.copy('*.so', dst='lib', keep_path=False) - self.copy('*.dylib', dst='lib', keep_path=False) - self.copy('*.a', dst='lib', keep_path=False) + srclibdir = os.path.join(self.source_folder, "lib") + if self.options.shared: + self.copy("wasmtime.dll.lib", src=srclibdir, dst="lib", keep_path=False) + self.copy("wasmtime.dll", src=srclibdir, dst="bin", keep_path=False) + self.copy("libwasmtime.dll.a", src=srclibdir, dst="lib", keep_path=False) + self.copy("libwasmtime.so*", src=srclibdir, dst="lib", keep_path=False) + self.copy("libwasmtime.dylib", src=srclibdir, dst="lib", keep_path=False) + else: + self.copy("wasmtime.lib", src=srclibdir, dst="lib", keep_path=False) + self.copy("libwasmtime.a", src=srclibdir, dst="lib", keep_path=False) self.copy('LICENSE', dst='licenses', src=self.source_folder) From 7eeed402d2de826ff8d6fcd7703ce35776989594 Mon Sep 17 00:00:00 2001 From: redradist Date: Mon, 30 Aug 2021 23:14:45 +0300 Subject: [PATCH 19/23] Updated versions of wasmtime --- recipes/wasmtime/all/conandata.yml | 24 ++++++++++++------------ recipes/wasmtime/config.yml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/recipes/wasmtime/all/conandata.yml b/recipes/wasmtime/all/conandata.yml index 60fd3433304f3..9cd51d586a7e1 100644 --- a/recipes/wasmtime/all/conandata.yml +++ b/recipes/wasmtime/all/conandata.yml @@ -2,24 +2,24 @@ sources: "0.28.0": Windows: "x86_64": - url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-x86_64-windows-c-api.zip" - sha256: "9bc1c2dad2a281efb3b4c577c12b02f15b80e1c95e9f7cf1512895b469ca3ce4" + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-x86_64-windows-c-api.zip" + sha256: "83d42ab6b78804f6dcd58f4bfc1bebb3a56a21309fce28e07a5bfbecc07dc8fa" MinGW: "x86_64": - url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-x86_64-mingw-c-api.zip" - sha256: "477719cf2de83121c3f3b05b9fbe6eca322ba56b9508e86322ecf73ed8085479" + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-x86_64-mingw-c-api.zip" + sha256: "d44b1345a7e3f86c71af6cc225b83bdb3aef874fb1eaac7a8f06ad3b3a6a5c3e" Linux: "x86_64": - url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-x86_64-linux-c-api.tar.xz" - sha256: "1ebc4f49fe80f775318d60720a44bc9157049ec0c63f01b7dc25483413f80b56" + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-x86_64-linux-c-api.tar.xz" + sha256: "b8ee53ddebfc60a0cf981ce225837b998b984ee94326e03cac135d9d78af57e5" "armv8": - url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-aarch64-linux-c-api.tar.xz" - sha256: "c752db1793cd3f95a4d760661b7e201a5a799a289c71d3fcff1b4f8670aaab16" + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-aarch64-linux-c-api.tar.xz" + sha256: "c13f906ca84c3321644cb9cd93fef4db431572e554a7527dc30a795994cbcc05" Macos: "x86_64": - url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-x86_64-macos-c-api.tar.xz" - sha256: "b8013ff01e928555b909dccdca7a8f10a466c949811d4e054bee8ef2950c753b" + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-x86_64-macos-c-api.tar.xz" + sha256: "e6e38b1837509af3ce5ca490d90c59d6082f54eb71dcbb49414ee5f295137bcb" Android: "armv8": - url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.28.0/wasmtime-v0.28.0-aarch64-linux-c-api.tar.xz" - sha256: "c752db1793cd3f95a4d760661b7e201a5a799a289c71d3fcff1b4f8670aaab16" + url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-aarch64-linux-c-api.tar.xz" + sha256: "c9036f82c2fb2c3ed8291c6d37068dce6b08dff83f6292938edc0c8907284549" diff --git a/recipes/wasmtime/config.yml b/recipes/wasmtime/config.yml index e64ed6c037d2c..2082bc997baf0 100644 --- a/recipes/wasmtime/config.yml +++ b/recipes/wasmtime/config.yml @@ -1,3 +1,3 @@ versions: - "0.28.0": + "0.29.0": folder: all From c1fa065f17d5a0c6f0e76f3b47f4ae31a0e7252e Mon Sep 17 00:00:00 2001 From: redradist Date: Mon, 30 Aug 2021 23:18:26 +0300 Subject: [PATCH 20/23] Updated forgot version ugrade --- recipes/wasmtime/all/conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wasmtime/all/conandata.yml b/recipes/wasmtime/all/conandata.yml index 9cd51d586a7e1..3e5ba12032d23 100644 --- a/recipes/wasmtime/all/conandata.yml +++ b/recipes/wasmtime/all/conandata.yml @@ -1,5 +1,5 @@ sources: - "0.28.0": + "0.29.0": Windows: "x86_64": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-x86_64-windows-c-api.zip" From 20d43a929a723326454f3e335fd66acb2c0526b8 Mon Sep 17 00:00:00 2001 From: redradist Date: Mon, 30 Aug 2021 23:37:59 +0300 Subject: [PATCH 21/23] Fixed sha256sum for macos --- recipes/wasmtime/all/conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wasmtime/all/conandata.yml b/recipes/wasmtime/all/conandata.yml index 3e5ba12032d23..99bb54025f9fc 100644 --- a/recipes/wasmtime/all/conandata.yml +++ b/recipes/wasmtime/all/conandata.yml @@ -18,7 +18,7 @@ sources: Macos: "x86_64": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-x86_64-macos-c-api.tar.xz" - sha256: "e6e38b1837509af3ce5ca490d90c59d6082f54eb71dcbb49414ee5f295137bcb" + sha256: "d80209990661e7cf8ae7a2db4ba931cd61da27e7956be05baf8cfe24d1951283" Android: "armv8": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-aarch64-linux-c-api.tar.xz" From ed7f4938d4caaf0f200503394254a90a8eef9469 Mon Sep 17 00:00:00 2001 From: redradist Date: Tue, 31 Aug 2021 00:27:11 +0300 Subject: [PATCH 22/23] Fixed SHA256 for Linux --- recipes/wasmtime/all/conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wasmtime/all/conandata.yml b/recipes/wasmtime/all/conandata.yml index 99bb54025f9fc..190dd1a6d0d6d 100644 --- a/recipes/wasmtime/all/conandata.yml +++ b/recipes/wasmtime/all/conandata.yml @@ -11,7 +11,7 @@ sources: Linux: "x86_64": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-x86_64-linux-c-api.tar.xz" - sha256: "b8ee53ddebfc60a0cf981ce225837b998b984ee94326e03cac135d9d78af57e5" + sha256: "e94a9a768270e86e7f7eac1a68575bb1f287702822e83b14c3b04bf7e865a84c" "armv8": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-aarch64-linux-c-api.tar.xz" sha256: "c13f906ca84c3321644cb9cd93fef4db431572e554a7527dc30a795994cbcc05" From 3012cca0c38c32b1e064e9ea178d8cd0c111f6c0 Mon Sep 17 00:00:00 2001 From: redradist Date: Tue, 31 Aug 2021 00:29:24 +0300 Subject: [PATCH 23/23] Updated all SHA256 to proer values --- recipes/wasmtime/all/conandata.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/wasmtime/all/conandata.yml b/recipes/wasmtime/all/conandata.yml index 190dd1a6d0d6d..03207b0b9b262 100644 --- a/recipes/wasmtime/all/conandata.yml +++ b/recipes/wasmtime/all/conandata.yml @@ -3,18 +3,18 @@ sources: Windows: "x86_64": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-x86_64-windows-c-api.zip" - sha256: "83d42ab6b78804f6dcd58f4bfc1bebb3a56a21309fce28e07a5bfbecc07dc8fa" + sha256: "57ba0732597c2fd8717738067e4067ff571f11ed87b32bd251fe0335bee107af" MinGW: "x86_64": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-x86_64-mingw-c-api.zip" - sha256: "d44b1345a7e3f86c71af6cc225b83bdb3aef874fb1eaac7a8f06ad3b3a6a5c3e" + sha256: "9c5c5c2baa624a04506474ca488c875d4fd99268370e74eb4ce12e6d9db767d4" Linux: "x86_64": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-x86_64-linux-c-api.tar.xz" sha256: "e94a9a768270e86e7f7eac1a68575bb1f287702822e83b14c3b04bf7e865a84c" "armv8": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-aarch64-linux-c-api.tar.xz" - sha256: "c13f906ca84c3321644cb9cd93fef4db431572e554a7527dc30a795994cbcc05" + sha256: "36a257aef36f5a0cabc8ce414e31ccede9c16ca996d6b07cb440a32aaa263164" Macos: "x86_64": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-x86_64-macos-c-api.tar.xz" @@ -22,4 +22,4 @@ sources: Android: "armv8": url: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.29.0/wasmtime-v0.29.0-aarch64-linux-c-api.tar.xz" - sha256: "c9036f82c2fb2c3ed8291c6d37068dce6b08dff83f6292938edc0c8907284549" + sha256: "36a257aef36f5a0cabc8ce414e31ccede9c16ca996d6b07cb440a32aaa263164"