Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more robust 'pkg-config' in extconf.rb #1417

Closed
wants to merge 1 commit into from
Closed

more robust 'pkg-config' in extconf.rb #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
source "https://rubygems.org/"

gem "mini_portile2", "~>2.1.0"
gem "pkg-config", "~>1.1.7"

gem "rdoc", "~>4.0", :group => [:development, :test]
gem "hoe-bundler", ">=1.1", :group => [:development, :test]
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ HOE = Hoe.spec 'nokogiri' do

unless java?
self.extra_deps += [
# Keep this version in sync with the one in extconf.rb !
["mini_portile2", "~> 2.1.0"],
["mini_portile2", "~> 2.1.0"], # keep version in sync with extconf.rb
["pkg-config", "~> 1.1.7"], # keep version in sync with extconf.rb
]
end

Expand Down
33 changes: 28 additions & 5 deletions ext/nokogiri/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,29 @@ def do_clean
exit! 0
end

# The gem version constraint in the Rakefile is not respected at install time.
# Keep this version in sync with the one in the Rakefile !
require 'rubygems'
gem 'pkg-config', '~> 1.1.7'
require 'pkg-config'
message "Using mini_portile version #{PKGConfig::VERSION}\n"

def package_config pkg, options={}
package = pkg_config(pkg)
return package if package

return nil unless PKGConfig.have_package(pkg)

cflags = PKGConfig.cflags(pkg)
ldflags = PKGConfig.libs_only_L(pkg)
libs = PKGConfig.libs_only_l(pkg)

Logging::message "PKGConfig package configuration for %s\n", pkg
Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", cflags, ldflags, libs

[cflags, ldflags, libs]
end

def nokogiri_try_compile
args = if defined?(RUBY_VERSION) && RUBY_VERSION <= "1.9.2"
["int main() {return 0;}"]
Expand Down Expand Up @@ -174,8 +197,8 @@ def iconv_configure_flags
return ['--with-iconv=yes']
end

if (config = preserving_globals { pkg_config('libiconv') }) &&
have_iconv?('pkg-config libiconv') { pkg_config('libiconv') }
if (config = preserving_globals { package_config('libiconv') }) &&
have_iconv?('pkg-config libiconv') { package_config('libiconv') }
cflags, ldflags, libs = config

return [
Expand Down Expand Up @@ -385,9 +408,9 @@ def using_system_libraries?
# Using system libraries means we rely on the system libxml2 with
# regard to the iconv support.

dir_config('xml2').any? or pkg_config('libxml-2.0')
dir_config('xslt').any? or pkg_config('libxslt')
dir_config('exslt').any? or pkg_config('libexslt')
dir_config('xml2').any? or package_config('libxml-2.0')
dir_config('xslt').any? or package_config('libxslt')
dir_config('exslt').any? or package_config('libexslt')

check_libxml_version or abort "ERROR: cannot discover where libxml2 is located on your system. please make sure `pkg-config` is installed."
check_libxml_version("2.6.21") or abort "ERROR: libxml2 version 2.6.21 or later is required!"
Expand Down