Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automake: drop old version and recipe fixes #15023

Merged
merged 25 commits into from
Jan 25, 2023
Merged

Automake: drop old version and recipe fixes #15023

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
44f0ae8
Automake Conan 2.0 compatibility
System-Arch Dec 30, 2022
d4113c4
Fixed lint and v1 issues
System-Arch Dec 30, 2022
039d525
Need autoconf for autoreconf
System-Arch Dec 31, 2022
dcf237c
Annotate patches per lint
System-Arch Dec 31, 2022
9e73483
Deleted spurious blank line at EOF
System-Arch Dec 31, 2022
dfecf39
Try working around v1 quirks
System-Arch Dec 31, 2022
28f09a9
Removed redundant setting of win_bash
System-Arch Jan 3, 2023
165f217
Don't specify env in call to self.run()
System-Arch Jan 3, 2023
a8d485a
See if reordering build requirements appeases Conan 1.x
System-Arch Jan 4, 2023
661f13c
Try adding VirtualBuildEnv to appease Conan 1.x
System-Arch Jan 4, 2023
b5cf16f
Bump required_conan_version to trigger rebuild now that autoconf has …
System-Arch Jan 13, 2023
9d530f5
Removed environment variables per discussion in conan-io/conan:#12812
System-Arch Jan 15, 2023
b63f393
Still need automake_dataroot_path
System-Arch Jan 15, 2023
606954f
Fixed definition of automake_dataroot_path
System-Arch Jan 15, 2023
ef62904
Replaced env. vars. with script-based paths
System-Arch Jan 16, 2023
b63cc9c
Removed extra blank line at EOF
System-Arch Jan 16, 2023
64b6607
Merge in changes from mainline
System-Arch Jan 16, 2023
f2f3519
Merge from mainline
System-Arch Jan 16, 2023
f018088
Remove obsolete patch files
System-Arch Jan 16, 2023
1bb1ae1
Bump required_conan_version
System-Arch Jan 17, 2023
f704319
Fixed lint warning
System-Arch Jan 20, 2023
fe8c61c
Merge branch 'master' into System-Arch-automake-1
System-Arch Jan 20, 2023
7eba669
Tweak required_conan_version() to restart CI after merge
System-Arch Jan 20, 2023
5e9bcb7
Removed autoconf as a build_requirement
System-Arch Jan 21, 2023
7fa1b39
Update recipes/automake/all/conanfile.py
prince-chrismc Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions recipes/automake/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,44 @@ sources:
"1.16.2":
url: "https://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.gz"
sha256: "b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1"
"1.16.1":
url: "https://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.gz"
sha256: "608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8"
patches:
"1.16.5":
- patch_file: "patches/0001-help2man-no-discard-stderr-1.16.5.patch"
patch_description: "help2man no discard stderr"
patch_type: "portability"
- patch_file: "patches/0002-no-perl-path-in-shebang-1.16.5.patch"
patch_description: "no perl path in shebang"
patch_type: "portability"
- patch_file: "patches/0003-relocatable-automake-1.16.5.patch"
patch_description: "relocatable automake"
patch_type: "portability"
"1.16.4":
- patch_file: "patches/0001-help2man-no-discard-stderr-1.16.4.patch"
patch_description: "help2man no discard stderr"
patch_type: "portability"
- patch_file: "patches/0002-no-perl-path-in-shebang-1.16.4.patch"
patch_description: "no perl path in shebang"
patch_type: "portability"
- patch_file: "patches/0003-relocatable-automake-1.16.4.patch"
patch_description: "relocatable automake"
patch_type: "portability"
"1.16.3":
- patch_file: "patches/0001-help2man-no-discard-stderr-1.16.3.patch"
patch_description: "help2man no discard stderr"
patch_type: "portability"
- patch_file: "patches/0002-no-perl-path-in-shebang-1.16.3.patch"
patch_description: "no perl path in shebang"
patch_type: "portability"
- patch_file: "patches/0003-relocatable-automake-1.16.3.patch"
patch_description: "relocatable automake"
patch_type: "portability"
"1.16.2":
- patch_file: "patches/0001-help2man-no-discard-stderr-1.16.2.patch"
patch_description: "help2man no discard stderr"
patch_type: "portability"
- patch_file: "patches/0002-no-perl-path-in-shebang-1.16.2.patch"
patch_description: "no perl path in shebang"
patch_type: "portability"
- patch_file: "patches/0003-relocatable-automake-1.16.2.patch"
"1.16.1":
- patch_file: "patches/0001-help2man-no-discard-stderr-1.16.1.patch"
- patch_file: "patches/0002-no-perl-path-in-shebang-1.16.1.patch"
- patch_file: "patches/0003-relocatable-automake-1.16.1.patch"
patch_description: "relocatable automake"
patch_type: "portability"
2 changes: 1 addition & 1 deletion recipes/automake/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from conan.tools.layout import basic_layout
from conan.tools.scm import Version

required_conan_version = ">=1.53.0"
required_conan_version = ">=1.55.0"
prince-chrismc marked this conversation as resolved.
Show resolved Hide resolved


class AutomakeConan(ConanFile):
Expand Down
13 changes: 0 additions & 13 deletions recipes/automake/all/patches/0001-help2man-no-discard-stderr-1.16.1.patch
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions recipes/automake/all/patches/0002-no-perl-path-in-shebang-1.16.1.patch
View file
Open in desktop

This file was deleted.

106 changes: 0 additions & 106 deletions recipes/automake/all/patches/0003-relocatable-automake-1.16.1.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion recipes/automake/all/test_package/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from conan.tools.files import chdir
from conan.tools.gnu import Autotools, AutotoolsToolchain
from conan.tools.layout import basic_layout
from conan.tools.microsoft import is_msvc, unix_path
from conan.tools.microsoft import unix_path


required_conan_version = ">=1.53.0"
Expand Down
2 changes: 0 additions & 2 deletions recipes/automake/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ versions:
folder: all
"1.16.2":
folder: all
"1.16.1":
folder: all