From 1575a6696969fdabf06be4bca222eea8fbcfaeec Mon Sep 17 00:00:00 2001 From: Matt Wrock Date: Tue, 21 Jun 2016 10:11:04 -0700 Subject: update nokogiri and dependencies --- omnibus/config/software/chef-gem-nokogiri.rb | 1 + omnibus/config/software/chef-gem-pkg-config.rb | 9 +++++++++ omnibus/config/software/chef.rb | 7 ------- 3 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 omnibus/config/software/chef-gem-pkg-config.rb (limited to 'omnibus/config') diff --git a/omnibus/config/software/chef-gem-nokogiri.rb b/omnibus/config/software/chef-gem-nokogiri.rb index 8bf7100d5b..a25a47d341 100644 --- a/omnibus/config/software/chef-gem-nokogiri.rb +++ b/omnibus/config/software/chef-gem-nokogiri.rb @@ -8,4 +8,5 @@ BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__) license "MIT" license_file "https://github.com/ruby-prof/ruby-prof/blob/master/LICENSE" +dependency "chef-gem-pkg-config" dependency "chef-gem-mini_portile2" diff --git a/omnibus/config/software/chef-gem-pkg-config.rb b/omnibus/config/software/chef-gem-pkg-config.rb new file mode 100644 index 0000000000..9c6e6fa695 --- /dev/null +++ b/omnibus/config/software/chef-gem-pkg-config.rb @@ -0,0 +1,9 @@ +# gem installs this gem from the version specified in chef's Gemfile.lock +# so we can take advantage of omnibus's caching. Just duplicate this file and +# add the new software def to chef software def if you want to separate +# another gem's installation. +require_relative "../../files/chef-gem/build-chef-gem/gem-install-software-def" +BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__) + +license "LGPL-2.1" +license_file "https://github.com/ruby-gnome2/pkg-config/blob/master/LGPL-2.1" diff --git a/omnibus/config/software/chef.rb b/omnibus/config/software/chef.rb index 49db136e94..c6ced7e566 100644 --- a/omnibus/config/software/chef.rb +++ b/omnibus/config/software/chef.rb @@ -69,13 +69,6 @@ build do block { log.info(log_key) { "" } } bundle "install --verbose", env: project_env - # For whatever reason, nokogiri software def deletes this (rather small) directory - block { log.info(log_key) { "" } } - block "Remove mini_portile test dir" do - mini_portile = shellout!("#{bundle_bin} show mini_portile").stdout.chomp - remove_directory File.join(mini_portile, "test") - end - # Check that it worked block { log.info(log_key) { "" } } bundle "check", env: project_env -- cgit v1.2.1