Skip to content
This repository has been archived by the owner on Nov 3, 2020. It is now read-only.

Revert "Fix Nokogiri Build" #422

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 1 addition & 11 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
Binary file removed patches/nokogiri-1.5.6.gem
Binary file not shown.