Skip to content

Commit

Permalink
wip: use mini_portile 2.8.5.rc1 to simplify extconf
Browse files Browse the repository at this point in the history
  • Loading branch information
@flavorjones
flavorjones committed Sep 13, 2023
1 parent deb4ae6 commit b9ff0ff
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 89 deletions.
130 changes: 42 additions & 88 deletions ext/nokogiri/extconf.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
REQUIRED_LIBXML_VERSION = "2.6.21"
RECOMMENDED_LIBXML_VERSION = "2.9.3"

REQUIRED_MINI_PORTILE_VERSION = "~> 2.8.2" # keep this version in sync with the one in the gemspec
REQUIRED_MINI_PORTILE_VERSION = "2.8.5.rc1" # keep this version in sync with the one in the gemspec
REQUIRED_PKG_CONFIG_VERSION = "~> 1.1"

# Keep track of what versions of what libraries we build against
Expand Down Expand Up @@ -429,7 +429,6 @@ def process_recipe(name, version, static_p, cross_p, cacheable_p = true)
require "rubygems"
gem("mini_portile2", REQUIRED_MINI_PORTILE_VERSION) # gemspec is not respected at install time
require "mini_portile2"
message("Using mini_portile version #{MiniPortile::VERSION}\n")

unless ["libxml2", "libxslt"].include?(name)
OTHER_LIBRARY_VERSIONS[name] = version
Expand Down Expand Up @@ -540,7 +539,6 @@ def recipe.port_path
chdir_for_build { recipe.cook }
FileUtils.touch(checkpoint)
end
recipe.activate
end
end

Expand Down Expand Up @@ -804,6 +802,15 @@ def configure
end
end

zlib_recipe.mkmf_config(pkg: "zlib")
ensure_package_configuration(
opt: "zlib",
pc: "zlib",
lib: "z",
headers: "zlib.h",
func: "gzdopen",
)

unless nix?
libiconv_recipe = process_recipe(
"libiconv",
Expand All @@ -829,7 +836,20 @@ def configure
"LDFLAGS=",
]
end

# libiconv does not ship with a pkg-config file
# append_cppflags("-I#{libiconv_recipe.path}/include")
# append_ldflags("-L#{libiconv_recipe.path}/lib")
libiconv_recipe.mkmf_config
ensure_package_configuration(
opt: "iconv",
pc: "iconv",
lib: "iconv",
headers: "iconv.h",
func: "iconv_open",
)
end

elsif darwin? && !have_header("iconv.h")
abort(<<~EOM.chomp)
-----
Expand All @@ -845,30 +865,6 @@ def configure
EOM
end

if zlib_recipe
append_cppflags("-I#{zlib_recipe.path}/include")
$LIBPATH = ["#{zlib_recipe.path}/lib"] | $LIBPATH
ensure_package_configuration(
opt: "zlib",
pc: "zlib",
lib: "z",
headers: "zlib.h",
func: "gzdopen",
)
end

if libiconv_recipe
append_cppflags("-I#{libiconv_recipe.path}/include")
$LIBPATH = ["#{libiconv_recipe.path}/lib"] | $LIBPATH
ensure_package_configuration(
opt: "iconv",
pc: "iconv",
lib: "iconv",
headers: "iconv.h",
func: "iconv_open",
)
end

libxml2_recipe = process_recipe("libxml2", dependencies["libxml2"]["version"], static_p, cross_build_p) do |recipe|
source_dir = arg_config("--with-xml2-source-dir")
if source_dir
Expand Down Expand Up @@ -924,6 +920,9 @@ def configure
]
end

libxml2_recipe.mkmf_config(pkg: "libxml-2.0")
ensure_func("xmlParseDoc", "libxml/parser.h")

libxslt_recipe = process_recipe("libxslt", dependencies["libxslt"]["version"], static_p, cross_build_p) do |recipe|
source_dir = arg_config("--with-xslt-source-dir")
if source_dir
Expand Down Expand Up @@ -963,72 +962,27 @@ def configure
]
end

append_cppflags("-DNOKOGIRI_PACKAGED_LIBRARIES")
append_cppflags("-DNOKOGIRI_PRECOMPILED_LIBRARIES") if cross_build_p
libxslt_recipe.mkmf_config(pkg: "libxslt")
ensure_func("xsltParseStylesheetDoc", "libxslt/xslt.h")

$libs = $libs.shellsplit.tap do |libs|
[libxml2_recipe, libxslt_recipe].each do |recipe|
libname = recipe.name[/\Alib(.+)\z/, 1]
config_basename = "#{libname}-config"
File.join(recipe.path, "bin", config_basename).tap do |config|
# call config scripts explicit with 'sh' for compat with Windows
cflags = %x(sh #{config} --cflags).strip
message("#{config_basename} cflags: #{cflags}\n")
$CPPFLAGS = concat_flags(cflags, $CPPFLAGS) # prepend

%x(sh #{config} --libs).strip.shellsplit.each do |arg|
case arg
when /\A-L(.+)\z/
# Prioritize ports' directories
$LIBPATH = if Regexp.last_match(1).start_with?(PACKAGE_ROOT_DIR + "/")
[Regexp.last_match(1)] | $LIBPATH
else
$LIBPATH | [Regexp.last_match(1)]
end
when /\A-l./
libs.unshift(arg)
else
$LDFLAGS << " " << arg.shellescape
end
end
end
libxslt_recipe.mkmf_config(pkg: "libexslt")
ensure_func("exsltFuncRegister", "libexslt/exslt.h")

patches_string = recipe.patch_files.map { |path| File.basename(path) }.join(" ")
append_cppflags(%[-DNOKOGIRI_#{recipe.name.upcase}_PATCHES="\\"#{patches_string}\\""])
if windows?
append_cppflags("-DLIBXSLT_STATIC -DLIBEXSLT_STATIC") # https://gitlab.gnome.org/GNOME/libxslt/-/merge_requests/66
end

case libname
when "xml2"
# xslt-config --libs or pkg-config libxslt --libs does not include
# -llzma, so we need to add it manually when linking statically.
if static_p && preserving_globals { local_have_library("lzma") }
# Add it at the end; GH #988
libs << "-llzma"
end
when "xslt"
# xslt-config does not have a flag to emit options including
# -lexslt, so add it manually.
libs.unshift("-lexslt")
end
end
end.shelljoin

if static_p
static_archive_ld_flag = needs_darwin_linker_hack ? ["-load_hidden"] : []
$libs = $libs.shellsplit.map do |arg|
case arg
when "-lxml2"
static_archive_ld_flag + [File.join(libxml2_recipe.path, "lib", libflag_to_filename(arg))]
when "-lxslt", "-lexslt"
static_archive_ld_flag + [File.join(libxslt_recipe.path, "lib", libflag_to_filename(arg))]
else
arg
end
end.flatten.shelljoin
# Nokogiri::VERSION_INFO metadata
append_cppflags("-DNOKOGIRI_PACKAGED_LIBRARIES")
append_cppflags("-DNOKOGIRI_PRECOMPILED_LIBRARIES") if cross_build_p
[libxml2_recipe, libxslt_recipe].each do |recipe|
patches_string = recipe.patch_files.map { |path| File.basename(path) }.join(" ")
append_cppflags(%[-DNOKOGIRI_#{recipe.name.upcase}_PATCHES="\\"#{patches_string}\\""])
end

ensure_func("xmlParseDoc", "libxml/parser.h")
ensure_func("xsltParseStylesheetDoc", "libxslt/xslt.h")
ensure_func("exsltFuncRegister", "libexslt/exslt.h")
# if static_p
# static_archive_ld_flag = needs_darwin_linker_hack ? ["-load_hidden"] : []
# end
end

libgumbo_recipe = process_recipe("libgumbo", "1.0.0-nokogiri", static_p, cross_build_p, false) do |recipe|
Expand Down
2 changes: 1 addition & 1 deletion nokogiri.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ Gem::Specification.new do |spec|
spec.requirements << "jar xerces, xercesImpl, 2.12.2" # https://search.maven.org/artifact/xerces/xercesImpl
spec.requirements << "jar xml-apis, xml-apis, 1.4.01" # https://search.maven.org/artifact/xml-apis/xml-apis
else
spec.add_runtime_dependency("mini_portile2", "~> 2.8.2") # keep version in sync with extconf.rb
spec.add_runtime_dependency("mini_portile2", "2.8.5.rc1") # keep version in sync with extconf.rb
end
spec.add_runtime_dependency("racc", "~> 1.4")

Expand Down

0 comments on commit b9ff0ff

Please sign in to comment.