Skip to content

Commit

Permalink
(conan-io#15023) Automake: drop old version and recipe fixes
Browse files Browse the repository at this point in the history
* Automake Conan 2.0 compatibility

* Fixed lint and v1 issues

* Need autoconf for autoreconf

* Annotate patches per lint

* Deleted spurious blank line at EOF

* Try working around v1 quirks

* Removed redundant setting of win_bash

* Don't specify env in call to self.run()

* See if reordering build requirements appeases Conan 1.x

* Try adding VirtualBuildEnv to appease Conan 1.x

* Bump required_conan_version to trigger rebuild now that autoconf has been updated

* Removed environment variables per discussion in conan-io/conan:conan-io#12812

* Still need automake_dataroot_path

* Fixed definition of automake_dataroot_path

* Replaced env. vars. with script-based paths

* Removed extra blank line at EOF

* Merge in changes from mainline

* Remove obsolete patch files

* Bump required_conan_version

* Fixed lint warning

* Tweak required_conan_version() to restart CI after merge

* Removed autoconf as a build_requirement

* Update recipes/automake/all/conanfile.py

Co-authored-by: Chris Mc <prince.chrismc@gmail.com>
  • Loading branch information
2 people authored and StellaSmith committed Feb 2, 2023
1 parent fd1fcce commit 1794d89
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 185 deletions.
31 changes: 24 additions & 7 deletions recipes/automake/all/conandata.yml
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"

This file was deleted.

This file was deleted.

106 changes: 0 additions & 106 deletions recipes/automake/all/patches/0003-relocatable-automake-1.16.1.patch

This file was deleted.

2 changes: 1 addition & 1 deletion recipes/automake/all/test_package/conanfile.py
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
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

0 comments on commit 1794d89

Please sign in to comment.