Skip to content

Commit

Permalink
(conan-io#24732) subunit: restore 1.4.0 build behavior
Browse files Browse the repository at this point in the history
Building 1.4.0 version under MacOSX armv8 fails probably because
reconfiguration is done. Try to keep previous behavior to make build
successful.
  • Loading branch information
vsbogd committed Aug 23, 2024
1 parent 2dcfbc8 commit f083eb7
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions recipes/subunit/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,14 @@ def build_requirements(self):
self.win_bash = True
if not self.conf.get("tools.microsoft.bash:path", check_type=str):
self.tool_requires("msys2/cci.latest")
self.tool_requires("libtool/2.4.7")
self.tool_requires("pkgconf/2.2.0")
self.tool_requires("automake/1.16.5")
if self.version == "1.4.0":
if is_msvc(self):
self.tool_requires("automake/1.16.5")
else:
# version >=1.4.4 is kept on GitHub without configuration built
self.tool_requires("libtool/2.4.7")
self.tool_requires("pkgconf/2.2.0")
self.tool_requires("automake/1.16.5")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand Down Expand Up @@ -139,7 +144,8 @@ def build(self):
apply_conandata_patches(self)
with chdir(self, self.source_folder):
autotools = Autotools(self)
autotools.autoreconf()
if self.version != "1.4.0":
autotools.autoreconf()
autotools.configure()
autotools.make()

Expand Down

0 comments on commit f083eb7

Please sign in to comment.