From c39bb98565d9a9a0a1ca6137411e87b7519dd048 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Thu, 17 Jun 2021 21:34:53 -0400 Subject: [PATCH 1/2] mpc: Update docs examples - chore no os.rename - chore remove_files_by_mask --- recipes/mpc/all/conanfile.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/recipes/mpc/all/conanfile.py b/recipes/mpc/all/conanfile.py index 02124a3798aa9..dfcd1091a667c 100644 --- a/recipes/mpc/all/conanfile.py +++ b/recipes/mpc/all/conanfile.py @@ -2,6 +2,7 @@ from conans.errors import ConanInvalidConfiguration import os +required_conan_version = ">=1.33.0" class MpcConan(ConanFile): name = "mpc" @@ -15,30 +16,27 @@ class MpcConan(ConanFile): options = {"shared": [True, False], "fPIC": [True, False]} default_options = {"shared": False, "fPIC": True} exports_sources = "patches/**" + _autotools = None @property def _source_subfolder(self): return "source_subfolder" - _autotools = None - def config_options(self): if self.settings.os == 'Windows': del self.options.fPIC - def requirements(self): - self.requires("mpfr/4.1.0") - def configure(self): if self.settings.compiler == "Visual Studio": raise ConanInvalidConfiguration("The mpc package cannot be built on Visual Studio.") del self.settings.compiler.libcxx del self.settings.compiler.cppstd + def requirements(self): + self.requires("mpfr/4.1.0") + def source(self): - tools.get(**self.conan_data["sources"][self.version]) - extracted_dir = self.name + "-" + self.version - os.rename(extracted_dir, self._source_subfolder) + tools.get(**self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder) def _configure_autotools(self): if self._autotools: @@ -63,7 +61,7 @@ def package(self): autotools = self._configure_autotools() autotools.install() tools.rmdir(os.path.join(self.package_folder, "share")) - os.unlink(os.path.join(self.package_folder, "lib", "libmpc.la")) + tools.remove_files_by_mask(os.path.join(self.package_folder, "lib"), "*.la") def package_info(self): self.cpp_info.libs = ["mpc"] From 02e1e53804ae08f016419781b6e60c427472bf06 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Fri, 18 Jun 2021 20:10:25 -0400 Subject: [PATCH 2/2] Update conanfile.py --- recipes/mpc/all/conanfile.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes/mpc/all/conanfile.py b/recipes/mpc/all/conanfile.py index dfcd1091a667c..4798dfea691a7 100644 --- a/recipes/mpc/all/conanfile.py +++ b/recipes/mpc/all/conanfile.py @@ -27,11 +27,15 @@ def config_options(self): del self.options.fPIC def configure(self): - if self.settings.compiler == "Visual Studio": - raise ConanInvalidConfiguration("The mpc package cannot be built on Visual Studio.") + if self.options.shared: + del self.options.fPIC del self.settings.compiler.libcxx del self.settings.compiler.cppstd + def validate(self): + if self.settings.compiler == "Visual Studio": + raise ConanInvalidConfiguration("The mpc package cannot be built on Visual Studio.") + def requirements(self): self.requires("mpfr/4.1.0")