|
1 | 1 | from conan import ConanFile
|
2 | 2 | from conan.tools.files import get, patch, chdir, copy, mkdir
|
3 | 3 | from conan.tools.microsoft import is_msvc, msvc_runtime_flag
|
4 |
| -from conan.tools.apple import is_apple_os |
| 4 | +from conan.tools.apple import is_apple_os, XCRun |
5 | 5 | from conan.tools.env import Environment
|
6 | 6 | from conan.tools.build import build_jobs
|
7 | 7 | from packaging.version import Version
|
@@ -95,8 +95,8 @@ def _source_subfolder(self):
|
95 | 95 | return "sources"
|
96 | 96 |
|
97 | 97 | def export_sources(self):
|
98 |
| - for patch in self.conan_data.get("patches", {}).get(self.version, []): |
99 |
| - self.copy(patch["patch_file"]) |
| 98 | + for p in self.conan_data.get("patches", {}).get(self.version, []): |
| 99 | + self.copy(p["patch_file"]) |
100 | 100 |
|
101 | 101 | def config_options(self):
|
102 | 102 | if self.settings.os == 'Windows':
|
@@ -141,9 +141,6 @@ def requirements(self):
|
141 | 141 | if self.options.with_boost:
|
142 | 142 | self.requires("boost/1.79.0")
|
143 | 143 |
|
144 |
| - def package_info(self): |
145 |
| - self.cpp_info.libs = ["botan"] |
146 |
| - |
147 | 144 | @property
|
148 | 145 | def _required_boost_components(self):
|
149 | 146 | return ['coroutine', 'system']
|
@@ -185,8 +182,8 @@ def source(self):
|
185 | 182 | get(conanfile=self, **self.conan_data['sources'][self.version], strip_root=True, destination=self._source_subfolder)
|
186 | 183 |
|
187 | 184 | def build(self):
|
188 |
| - for patch in self.conan_data.get('patches', {}).get(self.version, []): |
189 |
| - patch(self, **patch) |
| 185 | + for p in self.conan_data.get('patches', {}).get(self.version, []): |
| 186 | + patch(self, **p) |
190 | 187 | with chdir(self, self._source_subfolder):
|
191 | 188 | self.run(self._configure_cmd)
|
192 | 189 | self.run(self._make_cmd)
|
@@ -276,7 +273,7 @@ def _configure_cmd(self):
|
276 | 273 | self.settings.get_safe('os.subsystem'),
|
277 | 274 | self.settings.get_safe('arch'))
|
278 | 275 | botan_extra_cxx_flags.append(macos_min_version)
|
279 |
| - macos_sdk_path = '-isysroot {}'.format(tools.XCRun(self.settings).sdk_path) |
| 276 | + macos_sdk_path = '-isysroot {}'.format(XCRun(self.settings).sdk_path) |
280 | 277 | botan_extra_cxx_flags.append(macos_sdk_path)
|
281 | 278 |
|
282 | 279 | # This is to work around botan's configure script that *replaces* its
|
|
0 commit comments