Skip to content

Commit 4c0fde3

Browse files
vsbogdErniGHAbrilRBS
authored
subunit: add version 1.4.4 (#24773)
* (#24732) subunit: add version 1.4.4 * (#24732) subunit: fix PATH deprecation warning * (#24732) subunit: add build requirements automake, libtool and pkgconfig are required to configure project successfully * (#24732) subunit: restore 1.4.0 build behavior Building 1.4.0 version under MacOSX armv8 fails probably because reconfiguration is done. Try to keep previous behavior to make build successful. * pkgconf version range | remove old virtualbuildEnv | move conandata_patches to source method | change autoreconf if * Remove old version in favour of newer one, which simplifies recipe logic handling --------- Co-authored-by: Ernesto de Gracia Herranz <[email protected]> Co-authored-by: Abril Rincón Blanco <[email protected]>
1 parent 8cb82c6 commit 4c0fde3

File tree

6 files changed

+16
-65
lines changed

6 files changed

+16
-65
lines changed

recipes/subunit/all/conandata.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
sources:
2-
"1.4.0":
3-
url: "https://launchpad.net/subunit/trunk/1.4.0/+download/subunit-1.4.0.tar.gz"
4-
sha256: "00792096e96cbf1d5f9394dadd0ea73309a4f8b2214822949f1888ce5c2cf1c0"
5-
patches:
6-
"1.4.0":
7-
- patch_file: "patches/0001-fix-ExtUtils-MakeMaker-error.patch"
2+
"1.4.4":
3+
url: "https://github.com/testing-cabal/subunit/archive/refs/tags/1.4.4.tar.gz"
4+
sha256: "395787f52b8b36830c331faca546ea6c248b6cbd8de95989c2f64d432cc90531"

recipes/subunit/all/conanfile.py

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
from conan import ConanFile
55
from conan.errors import ConanInvalidConfiguration
66
from conan.tools.build import cross_building
7-
from conan.tools.env import Environment, VirtualBuildEnv, VirtualRunEnv
8-
from conan.tools.files import apply_conandata_patches, chdir, copy, export_conandata_patches, get, rm, rmdir
7+
from conan.tools.env import Environment, VirtualRunEnv
8+
from conan.tools.files import chdir, copy, get, rm, rmdir
99
from conan.tools.gnu import Autotools, AutotoolsDeps, AutotoolsToolchain
1010
from conan.tools.layout import basic_layout
1111
from conan.tools.microsoft import is_msvc, unix_path
1212
from conan.tools.scm import Version
1313

14-
required_conan_version = ">=1.53.0"
14+
required_conan_version = ">=2"
1515

1616

1717
class SubunitConan(ConanFile):
@@ -33,17 +33,10 @@ class SubunitConan(ConanFile):
3333
"fPIC": True,
3434
}
3535

36-
@property
37-
def _settings_build(self):
38-
return getattr(self, "settings_build", self.settings)
39-
4036
@property
4137
def _is_clang_cl(self):
4238
return self.settings.os == "Windows" and self.settings.compiler == "clang"
4339

44-
def export_sources(self):
45-
export_conandata_patches(self)
46-
4740
def config_options(self):
4841
if self.settings.os == "Windows":
4942
del self.options.fPIC
@@ -65,23 +58,22 @@ def validate(self):
6558
# Complete error is:
6659
# make[2]: *** No rule to make target `/Applications/Xcode-9.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE/config.h', needed by `Makefile'. Stop.
6760
raise ConanInvalidConfiguration("Due to weird make error involving missing config.h file in sysroot")
68-
if self.settings.compiler == "apple-clang" and self.options.shared:
69-
raise ConanInvalidConfiguration("Shared builds with apple-clang are not supported")
7061

7162
def build_requirements(self):
72-
if self._settings_build.os == "Windows":
63+
if self.settings_build.os == "Windows":
7364
self.win_bash = True
7465
if not self.conf.get("tools.microsoft.bash:path", check_type=str):
7566
self.tool_requires("msys2/cci.latest")
76-
if is_msvc(self):
77-
self.tool_requires("automake/1.16.5")
67+
# version >=1.4.4 is kept on GitHub without configuration built
68+
self.tool_requires("libtool/2.4.7")
69+
self.tool_requires("automake/1.16.5")
70+
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
71+
self.tool_requires("pkgconf/[>=2.2 <3]")
72+
7873
def source(self):
7974
get(self, **self.conan_data["sources"][self.version], strip_root=True)
8075

8176
def generate(self):
82-
env = VirtualBuildEnv(self)
83-
env.generate()
84-
8577
if not cross_building(self):
8678
env = VirtualRunEnv(self)
8779
env.generate(scope="build")
@@ -134,9 +126,9 @@ def generate(self):
134126
env.vars(self).save_script("conanbuild_msvc")
135127

136128
def build(self):
137-
apply_conandata_patches(self)
138129
with chdir(self, self.source_folder):
139130
autotools = Autotools(self)
131+
autotools.autoreconf()
140132
autotools.configure()
141133
autotools.make()
142134

@@ -164,4 +156,4 @@ def package_info(self):
164156
self.cpp_info.components["libcppunit_subunit"].set_property("pkg_config_name", "libcppunit_subunit")
165157

166158
bin_path = os.path.join(self.package_folder, "bin")
167-
self.env_info.PATH.append(bin_path)
159+
self.runenv_info.append_path("PATH", bin_path)

recipes/subunit/all/patches/0001-fix-ExtUtils-MakeMaker-error.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

recipes/subunit/all/test_v1_package/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

recipes/subunit/all/test_v1_package/conanfile.py

Lines changed: 0 additions & 17 deletions
This file was deleted.

recipes/subunit/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
versions:
2-
"1.4.0":
2+
"1.4.4":
33
folder: "all"

0 commit comments

Comments
 (0)