Skip to content

Commit

Permalink
Add automake-1.16
Browse files Browse the repository at this point in the history
This is needed to get chef-dk to build properly on CentOS 8. Some other fixes
include:

- 1.16 seems to rename the ``bootstrap.sh`` script back to ``bootstrap``
- Add build dependency of ``perl-thread-queue``
- Set default to 1.16 to ensure compatibility with CentOS 8

Signed-off-by: Lance Albertson <lance@osuosl.org>
  • Loading branch information
ramereth committed Nov 7, 2019
1 parent 1a12208 commit e7aae88
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions config/software/automake.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,18 @@
#

name "automake"
default_version "1.11.2"
default_version "1.16"

dependency "autoconf"
dependency "perl-thread-queue"

license "GPL-2.0"
license_file "COPYING"
skip_transitive_dependency_licensing true

version "1.15" do
source md5: "716946a105ca228ab545fc37a70df3a3"
end

version "1.11.2" do
source md5: "79ad64a9f6e83ea98d6964cef8d8a0bc"
end
version("1.16") { source md5: "7fb7155e553dc559ac39cf525f0bb5de" }
version("1.15") { source md5: "716946a105ca228ab545fc37a70df3a3" }
version("1.11.2") { source md5: "79ad64a9f6e83ea98d6964cef8d8a0bc" }

source url: "https://ftp.gnu.org/gnu/automake/automake-#{version}.tar.gz"

Expand All @@ -38,7 +35,7 @@
build do
env = with_standard_compiler_flags(with_embedded_path)

if version.satisfies?(">= 1.15")
if version.satisfies?(">= 1.15") && version.satisfies?("< 1.16")
command "./bootstrap.sh", env: env
else
command "./bootstrap", env: env
Expand Down

0 comments on commit e7aae88

Please sign in to comment.