diff --git a/Rakefile b/Rakefile index 98e97be7..39e1be2b 100644 --- a/Rakefile +++ b/Rakefile @@ -613,8 +613,6 @@ Dir.glob('/System/Library/Frameworks/Ruby.framework/Versions/[0-9]*/usr/lib/ruby installed_gem = File.join(GEM_HOME, 'specifications', "#{File.basename(gemspec, '.gemspec').split('-')[0..-2].join('-')}.CocoaPods-app.installed") installed_osx_gems << installed_gem file installed_gem => rubygems_update_dir do - suppress_upstream = false - require 'rubygems/specification' gem = Gem::Specification.load(gemspec) # First install the exact same version that Apple included in OS X. @@ -626,19 +624,11 @@ Dir.glob('/System/Library/Frameworks/Ruby.framework/Versions/[0-9]*/usr/lib/ruby when 'sqlite3' # sqlite3-1.3.7 depends on BigDecimal header from before BigDecimal was made into a gem. I doubt anybody really # uses sqlite for CocoaPods dependencies anyways, so just skip this old version. - when 'nokogiri' - # nokogiri currently has a design flaw that results in its build - # failing every time unless I manually patch extconf.rb. I have - # included a patched copy of nokogiri in the patches/ directory. - # Until this is remedied, I cannot install the upstream version - # of nokogiri. - install_gem(File.join(PATCHES_DIR, "#{File.basename(gemspec, '.gemspec')}.gem")) - suppress_upstream = true else install_gem(gem.name, gem.version) end # Now install the latest version of the gem. - install_gem(gem.name) unless suppress_upstream + install_gem(gem.name) # Create our nonsense file that's only used to track whether or not the gems were installed. touch installed_gem end diff --git a/patches/nokogiri-1.5.6.gem b/patches/nokogiri-1.5.6.gem deleted file mode 100644 index 80c3f7bf..00000000 Binary files a/patches/nokogiri-1.5.6.gem and /dev/null differ