|
1 | 1 | from conan import ConanFile |
2 | 2 | from conan.errors import ConanInvalidConfiguration, ConanException |
3 | | -from conan.tools.files import chdir, get, replace_in_file, copy |
| 3 | +from conan.tools.files import chdir, get, replace_in_file, copy, trim_conandata |
4 | 4 | from conan.tools.layout import basic_layout |
5 | 5 | import fnmatch |
6 | 6 | import os |
|
9 | 9 | import errno |
10 | 10 | import ctypes |
11 | 11 |
|
12 | | -required_conan_version = ">=1.47.0" |
| 12 | +required_conan_version = ">=2.2" |
13 | 13 |
|
14 | 14 |
|
15 | 15 | class lock: |
@@ -61,6 +61,11 @@ class MSYS2Conan(ConanFile): |
61 | 61 | def layout(self): |
62 | 62 | basic_layout(self, src_folder="src") |
63 | 63 |
|
| 64 | + def export(self): |
| 65 | + # this will ensure locally-exported recipes match the recipe revision from |
| 66 | + # the Conan Center remote |
| 67 | + trim_conandata(self) |
| 68 | + |
64 | 69 | def package_id(self): |
65 | 70 | del self.info.options.no_kill |
66 | 71 |
|
@@ -209,5 +214,4 @@ def package_info(self): |
209 | 214 | # Expose /opt/bin to PATH, so that aarch64-w64-mingw32- prefixed tools can be found |
210 | 215 | # Define autotools host/build triplet so that the right tools are used |
211 | 216 | self.cpp_info.bindirs.insert(0, os.path.join(msys_root, "opt", "bin")) |
212 | | - self.conf_info.define("tools.gnu:build_triplet", "x86_64-w64-mingw32") |
213 | 217 | self.conf_info.define("tools.gnu:host_triplet", "aarch64-w64-mingw32") |
0 commit comments