From c63504766944900294f41e8a15d471d45b9f41fb Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Mon, 7 Jun 2021 20:31:54 +0200 Subject: [PATCH] (#5600) sassc: resolve build requires conflicts * no os.rename * resolve build requirements conflicts * call autoreconf in build() only --- recipes/sassc/all/conanfile.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/recipes/sassc/all/conanfile.py b/recipes/sassc/all/conanfile.py index 7723b3853e7274..2d83a4883a44ee 100644 --- a/recipes/sassc/all/conanfile.py +++ b/recipes/sassc/all/conanfile.py @@ -2,6 +2,8 @@ from conans.errors import ConanInvalidConfiguration import os +required_conan_version = ">=1.33.0" + class SasscConan(ConanFile): name = "sassc" @@ -12,10 +14,6 @@ class SasscConan(ConanFile): topics = ("Sass", "sassc", "compiler") settings = "os", "compiler", "build_type", "arch" - build_requires = "autoconf/2.69", "libtool/2.4.6" - - requires = "libsass/3.6.4" - _autotools = None @property @@ -29,22 +27,27 @@ def config_options(self): def configure(self): if self.settings.os not in ["Linux", "FreeBSD", "Macos"]: raise ConanInvalidConfiguration("sassc supports only Linux, FreeBSD and Macos at this time, contributions are welcomed") - + + def requirements(self): + self.requires("libsass/3.6.4") + + def build_requirements(self): + self.build_requires("libtool/2.4.6") + def source(self): - tools.get(**self.conan_data["sources"][self.version]) - extracted_dir = self.name + "-" + self.version - tools.rename(extracted_dir, self._source_subfolder) + tools.get(**self.conan_data["sources"][self.version], + destination=self._source_subfolder, strip_root=True) def _configure_autotools(self): if self._autotools: return self._autotools - self.run("autoreconf -fiv", run_environment=True) self._autotools = AutoToolsBuildEnvironment(self) self._autotools.configure(args=["--disable-tests"]) return self._autotools def build(self): with tools.chdir(self._source_subfolder): + self.run("{} -fiv".format(tools.get_env("AUTORECONF")), run_environment=True) tools.save(path="VERSION", content="%s" % self.version) autotools = self._configure_autotools() autotools.make()