re2 1.7.0 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddba6fe8bb8c7e51bcb0b8f4346b39ca903978ff6697a4c14d06702baae10598
-  data.tar.gz: f8905eeeeff7e4bebc532d23fa19b29f1c3e2a88ea303a5aa879bafb4af4e1ed
+  metadata.gz: b84cf6ec8ce5bd9800f96ec578e998e4b8ca5345c1c96eaa699d0a0eebb03e2c
+  data.tar.gz: c7e89da8456e80c91f287ee444cf69daad53af97cd604e44e3cdf685f8af34f8
 SHA512:
-  metadata.gz: 44184ad41a55746903fcd350fbf473d26266c710e324eaac879b46ff45e3b77120d5100a25f5188e2d938cafbc48caf909506d79cf07c31522ccfb9e789c2ce0
-  data.tar.gz: eb282abd472e00ebcbb10e38f84c62bbac785bd139c69140647a29a157475600b6845472edb41ed42234caf5729188052cc1459b1ac2775c544ed0e905c6039d
+  metadata.gz: 9b018c0bbf42935fc86828b478dc85c4ff3e14ee89a5c27d2fb77ac120bcd1ad65b9277d9a53e031260710669ccd65d508018f70a78ad8a871ee1c21f65c2360
+  data.tar.gz: ff2832314da390eab285d44739b01ddfbc35ec4de635284d7886ead84b914b0b4d30dc4c80d50cf4e9cdfb91b3813a239e8206405bd5b12df496ce8b7ec92b25

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem "rake", "> 12.3.2"

data/README.md

@@ -4,17 +4,33 @@ re2 [![Build Status](https://github.com/mudge/re2/actions/workflows/tests.yml/ba
 A Ruby binding to [re2][], an "efficient, principled regular expression
 library".
 
-**Current version:** 1.7.0  
-**Supported Ruby versions:** 1.8.7, 1.9.3, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2  
+**Current version:** 2.0.0.beta1  
+**Supported Ruby versions:** 2.7, 3.0, 3.1, 3.2  
+**Bundled re2 version:** libre2.11 (2023-09-01)  
 **Supported re2 versions:** libre2.0 (< 2020-03-02), libre2.1 (2020-03-02), libre2.6 (2020-03-03), libre2.7 (2020-05-01), libre2.8 (2020-07-06), libre2.9 (2020-11-01), libre2.10 (2022-12-01), libre2.11 (2023-07-01)
 
 Installation
 ------------
 
-You will need [re2][] installed as well as a C++ compiler such as [gcc][] (on
-Debian and Ubuntu, this is provided by the [build-essential][] package). If
-you are using Mac OS X, I recommend installing re2 with [Homebrew][] by
-running the following:
+The gem comes bundled with a version of [re2][] and will compile itself (and
+any dependencies) on install. As compilation can take a while, precompiled
+native gems are available for Linux, Windows and macOS.
+
+In v2.0 and later, precompiled native gems are available for Ruby 2.7 to 3.2
+on these platforms:
+
+- `aarch64-linux` (requires: glibc >= 2.29)
+- `arm-linux` (requires: glibc >= 2.29)
+- `arm64-darwin`
+- `x64-mingw32` / `x64-mingw-ucrt`
+- `x86-linux` (requires: glibc >= 2.17)
+- `x86_64-darwin`
+- `x86_64-linux` (requires: glibc >= 2.17)
+
+If you wish to opt out of using the bundled libraries, you will need re2
+installed as well as a C++ compiler such as [gcc][] (on Debian and Ubuntu, this
+is provided by the [build-essential][] package). If you are using Mac OS X, I
+recommend installing re2 with [Homebrew][] by running the following:
 
     $ brew install re2
 
@@ -22,20 +38,26 @@ If you are using Debian, you can install the [libre2-dev][] package like so:
 
     $ sudo apt-get install libre2-dev
 
-Recent versions of re2 require a compiler with C++14 support such as [clang](http://clang.llvm.org/) 3.4 or [gcc](https://gcc.gnu.org/) 5.
+Recent versions of re2 require a compiler with C++14 support such as
+[clang](http://clang.llvm.org/) 3.4 or [gcc](https://gcc.gnu.org/) 5.
 
 If you are using a packaged Ruby distribution, make sure you also have the
 Ruby header files installed such as those provided by the [ruby-dev][] package
 on Debian and Ubuntu.
 
-You can then install the library via RubyGems with `gem install re2` or `gem
-install re2 -- --with-re2-dir=/path/to/re2/prefix` if re2 is not installed in
-any of the following default locations:
+You can then install the library via RubyGems with `gem install re2 --platform=ruby --
+--enable-system-libraries` or `gem install re2 --platform=ruby -- --enable-system-libraries
+--with-re2-dir=/path/to/re2/prefix` if re2 is not installed in any of the
+following default locations:
 
 * `/usr/local`
 * `/opt/homebrew`
 * `/usr`
 
+If you're using Bundler, you can use the
+[`force_ruby_platform`](https://bundler.io/v2.3/man/gemfile.5.html#FORCE_RUBY_PLATFORM)
+option in your Gemfile.
+
 Documentation
 -------------
 
@@ -214,7 +236,7 @@ Contributions
 * Thanks to [Jason Woods](https://github.com/driskell) who contributed the
   original implementations of `RE2::MatchData#begin` and `RE2::MatchData#end`;
 * Thanks to [Stefano Rivera](https://github.com/stefanor) who first contributed C++11 support;
-* Thanks to [Stan Hu](https://github.com/stanhu) for reporting a bug with empty patterns and `RE2::Regexp#scan` and for contributing support for libre2.11 (2023-07-01);
+* Thanks to [Stan Hu](https://github.com/stanhu) for reporting a bug with empty patterns and `RE2::Regexp#scan`, contributing support for libre2.11 (2023-07-01) and for vendoring re2 and abseil and compiling native gems in 2.0;
 * Thanks to [Sebastian Reitenbach](https://github.com/buzzdeee) for reporting
   the deprecation and removal of the `utf8` encoding option in re2;
 * Thanks to [Sergio Medina](https://github.com/serch) for reporting a bug when

data/Rakefile

@@ -1,10 +1,132 @@
+# frozen_string_literal: true
+
 require 'rake/extensiontask'
 require 'rspec/core/rake_task'
+require 'rake_compiler_dock'
+require 'yaml'
+
+require_relative 'ext/re2/recipes'
+
+CLEAN.include FileList['**/*{.o,.so,.dylib,.bundle}'],
+              FileList['**/extconf.h'],
+              FileList['**/Makefile'],
+              FileList['pkg/']
+
+CLOBBER.include FileList['**/tmp'],
+                FileList['**/*.log'],
+                FileList['doc/**'],
+                FileList['tmp/']
+CLOBBER.add("ports/*").exclude(%r{ports/archives$})
+
+RE2_GEM_SPEC = Gem::Specification.load('re2.gemspec')
+
+task :prepare do
+  puts "Preparing project for gem building..."
+  recipes = load_recipes
+  recipes.each { |recipe| recipe.download }
+end
 
-Rake::ExtensionTask.new('re2')
+task gem: :prepare
+
+Gem::PackageTask.new(RE2_GEM_SPEC) do |p|
+  p.need_zip = false
+  p.need_tar = false
+end
+
+CROSS_RUBY_VERSIONS = %w[3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(':')
+CROSS_RUBY_PLATFORMS = %w[
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x64-mingw-ucrt
+  x64-mingw32
+  x86-linux
+  x86-mingw32
+  x86_64-darwin
+  x86_64-linux
+].freeze
+
+ENV['RUBY_CC_VERSION'] = CROSS_RUBY_VERSIONS
+
+Rake::ExtensionTask.new('re2', RE2_GEM_SPEC) do |e|
+  e.cross_compile = true
+  e.cross_config_options << '--enable-cross-build'
+  e.config_options << '--disable-system-libraries'
+  e.cross_platform = CROSS_RUBY_PLATFORMS
+  e.cross_compiling do |spec|
+    spec.files.reject! { |path| File.fnmatch?('ports/*', path) }
+    spec.dependencies.reject! { |dep| dep.name == 'mini_portile2' }
+  end
+end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :spec    => :compile
-task :default => :spec
+namespace 'gem' do
+  def gem_builder(platform)
+    # use Task#invoke because the pkg/*gem task is defined at runtime
+    Rake::Task["native:#{platform}"].invoke
+    Rake::Task["pkg/#{RE2_GEM_SPEC.full_name}-#{Gem::Platform.new(platform)}.gem"].invoke
+  end
+
+  CROSS_RUBY_PLATFORMS.each do |platform|
+    # The Linux x86 image (ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x86_64-linux)
+    # is based on CentOS 7 and has two versions of cmake installed:
+    # a 2.8 version in /usr/bin and a 3.25 in /usr/local/bin. The latter is needed by abseil.
+    cmake =
+      case platform
+      when 'x86_64-linux', 'x86-linux'
+        '/usr/local/bin/cmake'
+      else
+        'cmake'
+      end
+
+    desc "build native gem for #{platform} platform"
+    task platform do
+      RakeCompilerDock.sh <<~SCRIPT, platform: platform, verbose: true
+        gem install bundler --no-document &&
+        bundle &&
+        bundle exec rake gem:#{platform}:builder CMAKE=#{cmake}
+      SCRIPT
+    end
+
+    namespace platform do
+      desc "build native gem for #{platform} platform (guest container)"
+      task 'builder' do
+        gem_builder(platform)
+      end
+    end
+  end
+
+  desc 'build all native gems'
+  multitask 'native' => CROSS_RUBY_PLATFORMS
+end
+
+def add_file_to_gem(relative_source_path)
+  dest_path = File.join(gem_build_path, relative_source_path)
+  dest_dir = File.dirname(dest_path)
+
+  mkdir_p dest_dir unless Dir.exist?(dest_dir)
+  rm_f dest_path if File.exist?(dest_path)
+  safe_ln relative_source_path, dest_path
+
+  RE2_GEM_SPEC.files << relative_source_path
+end
+
+def gem_build_path
+  File.join 'pkg', RE2_GEM_SPEC.full_name
+end
+
+def add_vendored_libraries
+  dependencies = YAML.load_file(File.join(File.dirname(__FILE__), 'dependencies.yml'))
+  abseil_archive = File.join('ports', 'archives', "#{dependencies['abseil']['version']}.tar.gz")
+  libre2_archive = File.join('ports', 'archives', "re2-#{dependencies['libre2']['version']}.tar.gz")
+
+  add_file_to_gem(abseil_archive)
+  add_file_to_gem(libre2_archive)
+end
+
+task gem_build_path do
+  add_vendored_libraries
+end
 
+task default: [:compile, :spec]

data/dependencies.yml

@@ -0,0 +1,9 @@
+libre2:
+  version: "2023-09-01"
+  sha256: "5bb6875ae1cd1e9fedde98018c346db7260655f86fdb8837e3075103acd3649b"
+  # sha-256 hash provided in https://github.com/google/re2/releases/download/2023-09-01/re2-2023-09-01.tar.gz
+
+abseil:
+  version: "20230125.3"
+  sha256: 5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36
+  # sha-256 hash provided in https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz

data/ext/re2/extconf.rb

@@ -5,6 +5,107 @@
 # Released under the BSD Licence, please see LICENSE.txt
 
 require 'mkmf'
+require_relative 'recipes'
+
+RE2_HELP_MESSAGE = <<~HELP
+  USAGE: ruby #{$0} [options]
+
+    Flags that are always valid:
+
+      --enable-system-libraries
+          Use system libraries instead of building and using the packaged libraries.
+
+      --disable-system-libraries
+          Use the packaged libraries, and ignore the system libraries. This is the default.
+
+
+    Flags only used when using system libraries:
+
+      Related to re2 library:
+
+        --with-re2-dir=DIRECTORY
+            Look for re2 headers and library in DIRECTORY.
+
+
+    Flags only used when building and using the packaged libraries:
+
+      --enable-cross-build
+          Enable cross-build mode. (You probably do not want to set this manually.)
+
+
+    Environment variables used:
+
+      CC
+          Use this path to invoke the compiler instead of `RbConfig::CONFIG['CC']`
+
+      CPPFLAGS
+          If this string is accepted by the C preprocessor, add it to the flags passed to the C preprocessor
+
+      CFLAGS
+          If this string is accepted by the compiler, add it to the flags passed to the compiler
+
+      LDFLAGS
+          If this string is accepted by the linker, add it to the flags passed to the linker
+
+      LIBS
+          Add this string to the flags passed to the linker
+HELP
+
+#
+#  utility functions
+#
+def config_system_libraries?
+  enable_config("system-libraries", ENV.key?('RE2_USE_SYSTEM_LIBRARIES'))
+end
+
+def config_cross_build?
+  enable_config("cross-build")
+end
+
+def concat_flags(*args)
+  args.compact.join(" ")
+end
+
+def do_help
+  print(RE2_HELP_MESSAGE)
+  exit!(0)
+end
+
+def darwin?
+  RbConfig::CONFIG["target_os"].include?("darwin")
+end
+
+def windows?
+  RbConfig::CONFIG["target_os"].match?(/mingw|mswin/)
+end
+
+def freebsd?
+  RbConfig::CONFIG["target_os"].include?("freebsd")
+end
+
+def target_host
+  # We use 'host' to set compiler prefix for cross-compiling. Prefer host_alias over host. And
+  # prefer i686 (what external dev tools use) to i386 (what ruby's configure.ac emits).
+  host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
+  host.gsub(/i386/, "i686")
+end
+
+def target_arch
+  RbConfig::CONFIG['arch']
+end
+
+def with_temp_dir
+  Dir.mktmpdir do |temp_dir|
+    Dir.chdir(temp_dir) do
+      yield
+    end
+  end
+end
+
+#
+#  main
+#
+do_help if arg_config('--help')
 
 if ENV["CC"]
   RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"]
@@ -16,70 +117,59 @@ if ENV["CXX"]
   RbConfig::CONFIG["CXX"] = ENV["CXX"]
 end
 
-header_dirs = [
-  "/usr/local/include",
-  "/opt/homebrew/include",
-  "/usr/include"
-]
-
-lib_dirs = [
-  "/usr/local/lib",
-  "/opt/homebrew/lib",
-  "/usr/lib"
-]
-
-dir_config("re2", header_dirs, lib_dirs)
+def build_extension(static_p = false)
+  # Enable optional warnings but disable deprecated register warning for Ruby 2.6 support
+  $CFLAGS << " -Wall -Wextra -funroll-loops"
+  $CPPFLAGS << " -Wno-register"
 
-$CFLAGS << " -Wall -Wextra -funroll-loops"
+  # Pass -x c++ to force gcc to compile the test program
+  # as C++ (as it will end in .c by default).
+  compile_options = "-x c++"
 
-# Pass -x c++ to force gcc to compile the test program
-# as C++ (as it will end in .c by default).
-compile_options = "-x c++"
+  have_library("stdc++")
+  have_header("stdint.h")
+  have_func("rb_str_sublen")
 
-have_library("stdc++")
-have_header("stdint.h")
-have_func("rb_str_sublen")
-
-unless have_library("re2")
-  abort "You must have re2 installed and specified with --with-re2-dir, please see https://github.com/google/re2/wiki/Install"
-end
+  if !static_p and !have_library("re2")
+    abort "You must have re2 installed and specified with --with-re2-dir, please see https://github.com/google/re2/wiki/Install"
+  end
 
-minimal_program = <<SRC
+  minimal_program = <<SRC
 #include <re2/re2.h>
 int main() { return 0; }
 SRC
 
-re2_requires_version_flag = checking_for("re2 that requires explicit C++ version flag") do
-  !try_compile(minimal_program, compile_options)
-end
+  re2_requires_version_flag = checking_for("re2 that requires explicit C++ version flag") do
+    !try_compile(minimal_program, compile_options)
+  end
 
-if re2_requires_version_flag
-  # Recent versions of re2 depend directly on abseil, which requires a
-  # compiler with C++14 support (see
-  # https://github.com/abseil/abseil-cpp/issues/1127 and
-  # https://github.com/abseil/abseil-cpp/issues/1431). However, the
-  # `std=c++14` flag doesn't appear to suffice; we need at least
-  # `std=c++17`.
-  abort "Cannot compile re2 with your compiler: recent versions require C++14 support." unless %w[c++20 c++17 c++11 c++0x].any? do |std|
-    checking_for("re2 that compiles with #{std} standard") do
-      if try_compile(minimal_program, compile_options + " -std=#{std}")
-        compile_options << " -std=#{std}"
-        $CPPFLAGS << " -std=#{std}"
+  if re2_requires_version_flag
+    # Recent versions of re2 depend directly on abseil, which requires a
+    # compiler with C++14 support (see
+    # https://github.com/abseil/abseil-cpp/issues/1127 and
+    # https://github.com/abseil/abseil-cpp/issues/1431). However, the
+    # `std=c++14` flag doesn't appear to suffice; we need at least
+    # `std=c++17`.
+    abort "Cannot compile re2 with your compiler: recent versions require C++14 support." unless %w[c++20 c++17 c++11 c++0x].any? do |std|
+      checking_for("re2 that compiles with #{std} standard") do
+        if try_compile(minimal_program, compile_options + " -std=#{std}")
+          compile_options << " -std=#{std}"
+          $CPPFLAGS << " -std=#{std}"
 
-        true
+          true
+        end
       end
     end
   end
-end
 
-# Determine which version of re2 the user has installed.
-# Revision d9f8806c004d added an `endpos` argument to the
-# generic Match() function.
-#
-# To test for this, try to compile a simple program that uses
-# the newer form of Match() and set a flag if it is successful.
-checking_for("RE2::Match() with endpos argument") do
-  test_re2_match_signature = <<SRC
+  # Determine which version of re2 the user has installed.
+  # Revision d9f8806c004d added an `endpos` argument to the
+  # generic Match() function.
+  #
+  # To test for this, try to compile a simple program that uses
+  # the newer form of Match() and set a flag if it is successful.
+  checking_for("RE2::Match() with endpos argument") do
+    test_re2_match_signature = <<SRC
 #include <re2/re2.h>
 
 int main() {
@@ -91,13 +181,13 @@ int main() {
 }
 SRC
 
-  if try_compile(test_re2_match_signature, compile_options)
-    $defs.push("-DHAVE_ENDPOS_ARGUMENT")
+    if try_compile(test_re2_match_signature, compile_options)
+      $defs.push("-DHAVE_ENDPOS_ARGUMENT")
+    end
   end
-end
 
-checking_for("RE2::Set::Match() with error information") do
-  test_re2_set_match_signature = <<SRC
+  checking_for("RE2::Set::Match() with error information") do
+    test_re2_set_match_signature = <<SRC
 #include <vector>
 #include <re2/re2.h>
 #include <re2/set.h>
@@ -115,9 +205,234 @@ int main() {
 }
 SRC
 
-  if try_compile(test_re2_set_match_signature, compile_options)
-    $defs.push("-DHAVE_ERROR_INFO_ARGUMENT")
+    if try_compile(test_re2_set_match_signature, compile_options)
+      $defs.push("-DHAVE_ERROR_INFO_ARGUMENT")
+    end
   end
 end
 
+def process_recipe(recipe)
+  cross_build_p = config_cross_build?
+  message "Cross build is #{cross_build_p ? "enabled" : "disabled"}.\n"
+
+  recipe.host = target_host
+  # Ensure x64-mingw-ucrt and x64-mingw32 use different library paths since the host
+  # is the same (x86_64-w64-mingw32).
+  recipe.target = File.join(recipe.target, target_arch) if cross_build_p
+
+  yield recipe
+
+  checkpoint = "#{recipe.target}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
+  name = recipe.name
+  version = recipe.version
+
+  if File.exist?(checkpoint)
+    message("Building re2 with a packaged version of #{name}-#{version}.\n")
+  else
+    message(<<~EOM)
+        ---------- IMPORTANT NOTICE ----------
+        Building re2 with a packaged version of #{name}-#{version}.
+        Configuration options: #{recipe.configure_options.shelljoin}
+      EOM
+
+    unless recipe.patch_files.empty?
+      message("The following patches are being applied:\n")
+
+      recipe.patch_files.each do |patch|
+        message("  - %s\n" % File.basename(patch))
+      end
+    end
+
+    # Use a temporary base directory to reduce filename lengths since
+    # Windows can hit a limit of 250 characters (CMAKE_OBJECT_PATH_MAX).
+    with_temp_dir { recipe.cook }
+
+    FileUtils.touch(checkpoint)
+  end
+
+  recipe.activate
+end
+
+def build_with_system_libraries
+  header_dirs = [
+    "/usr/local/include",
+    "/opt/homebrew/include",
+    "/usr/include"
+  ]
+
+  lib_dirs = [
+    "/usr/local/lib",
+    "/opt/homebrew/lib",
+    "/usr/lib"
+  ]
+
+  dir_config("re2", header_dirs, lib_dirs)
+
+  build_extension
+end
+
+# pkgconf v1.9.3 on Windows incorrectly sorts the output of `pkg-config
+# --libs --static`, resulting in build failures: https://github.com/pkgconf/pkgconf/issues/268.
+# To work around the issue, store the correct order of abseil flags here and add them manually
+# for Windows.
+#
+# Note that `-ldbghelp` is incorrectly added before `-labsl_symbolize` in abseil:
+# https://github.com/abseil/abseil-cpp/issues/1497
+ABSL_LDFLAGS = %w[
+  -labsl_flags
+  -labsl_flags_internal
+  -labsl_flags_marshalling
+  -labsl_flags_reflection
+  -labsl_flags_private_handle_accessor
+  -labsl_flags_commandlineflag
+  -labsl_flags_commandlineflag_internal
+  -labsl_flags_config
+  -labsl_flags_program_name
+  -labsl_cord
+  -labsl_cordz_info
+  -labsl_cord_internal
+  -labsl_cordz_functions
+  -labsl_cordz_handle
+  -labsl_crc_cord_state
+  -labsl_crc32c
+  -labsl_crc_internal
+  -labsl_crc_cpu_detect
+  -labsl_hash
+  -labsl_city
+  -labsl_bad_variant_access
+  -labsl_low_level_hash
+  -labsl_raw_hash_set
+  -labsl_hashtablez_sampler
+  -labsl_exponential_biased
+  -labsl_bad_optional_access
+  -labsl_str_format_internal
+  -labsl_synchronization
+  -labsl_graphcycles_internal
+  -labsl_stacktrace
+  -labsl_symbolize
+  -ldbghelp
+  -labsl_debugging_internal
+  -labsl_demangle_internal
+  -labsl_malloc_internal
+  -labsl_time
+  -labsl_civil_time
+  -labsl_strings
+  -labsl_strings_internal
+  -ladvapi32
+  -labsl_base
+  -labsl_spinlock_wait
+  -labsl_int128
+  -labsl_throw_delegate
+  -labsl_raw_logging_internal
+  -labsl_log_severity
+  -labsl_time_zone
+].freeze
+
+def libflag_to_filename(ldflag)
+  case ldflag
+  when /\A-l(.+)/
+    "lib#{Regexp.last_match(1)}.#{$LIBEXT}"
+  end
+end
+
+# This method does a number of things to ensure the final shared library
+# is compiled statically with the vendored libraries:
+#
+# 1. For -L<path> flags, ensure that any `ports` paths are prioritized just
+#    in case there are installed libraries that might take precedence.
+# 2. For -l<lib> flags, convert the library to the static library with a
+#    full path and substitute the absolute static library.  For example,
+#    -lre2 maps to /path/to/ports/<arch>/libre2/<version>/lib/libre2.a.
+#
+# This is needed because when building the extension, Ruby appears to
+# insert `-L#{RbConfig::CONFIG['exec_prefix']}/lib` first. If libre2 is
+# in installed in that location then the extension will link against the
+# system library instead of the vendored library.
+def add_flag(arg, lib_paths)
+  case arg
+  when /\A-L(.+)\z/
+    # Prioritize ports' directories
+    lib_dir = Regexp.last_match(1)
+    $LIBPATH =
+      if lib_dir.start_with?(PACKAGE_ROOT_DIR + "/")
+        [lib_dir] | $LIBPATH
+      else
+        $LIBPATH | [lib_dir]
+      end
+  when /\A-l./
+    filename = libflag_to_filename(arg)
+
+    added = false
+    lib_paths.each do |path|
+      static_lib = File.join(path, filename)
+
+      next unless File.exist?(static_lib)
+
+      $LDFLAGS << " " << static_lib
+      added = true
+      break
+    end
+
+    append_ldflags(arg.shellescape) unless added
+  else
+    append_ldflags(arg.shellescape)
+  end
+end
+
+def add_static_ldflags(flags, lib_paths)
+  static_flags = flags.strip.shellsplit
+
+  if MiniPortile.windows?
+    static_flags.each { |flag| add_flag(flag, lib_paths) unless ABSL_LDFLAGS.include?(flag) }
+    ABSL_LDFLAGS.each { |flag| add_flag(flag, lib_paths) }
+  else
+    static_flags.each { |flag| add_flag(flag, lib_paths) }
+  end
+end
+
+def build_with_vendored_libraries
+  message "Building re2 using packaged libraries.\n"
+
+  abseil_recipe, re2_recipe = load_recipes
+
+  process_recipe(abseil_recipe) do |recipe|
+    recipe.configure_options += ['-DABSL_PROPAGATE_CXX_STD=ON', '-DCMAKE_CXX_VISIBILITY_PRESET=hidden']
+  end
+
+  process_recipe(re2_recipe) do |recipe|
+    recipe.configure_options += ["-DCMAKE_PREFIX_PATH=#{abseil_recipe.path}", '-DCMAKE_CXX_FLAGS=-DNDEBUG',
+                                 '-DCMAKE_CXX_VISIBILITY_PRESET=hidden']
+  end
+
+  dir_config("re2", File.join(re2_recipe.path, 'include'), File.join(re2_recipe.path, 'lib'))
+  dir_config("abseil", File.join(abseil_recipe.path, 'include'), File.join(abseil_recipe.path, 'lib'))
+
+  pkg_config_paths = [
+    "#{abseil_recipe.path}/lib/pkgconfig",
+    "#{re2_recipe.path}/lib/pkgconfig"
+  ].join(File::PATH_SEPARATOR)
+
+  pkg_config_paths = "#{ENV['PKG_CONFIG_PATH']}#{File::PATH_SEPARATOR}#{pkg_config_paths}" if ENV['PKG_CONFIG_PATH']
+
+  ENV['PKG_CONFIG_PATH'] = pkg_config_paths
+  pc_file = File.join(re2_recipe.path, 'lib', 'pkgconfig', 're2.pc')
+
+  raise 'Please install the `pkg-config` utility!' unless find_executable('pkg-config')
+
+  # See https://bugs.ruby-lang.org/issues/18490, broken in Ruby 3.1 but fixed in Ruby 3.2.
+  flags = xpopen(['pkg-config', '--libs', '--static', pc_file], err: %i[child out], &:read)
+
+  raise 'Unable to run pkg-config --libs --static' unless $?.success?
+
+  lib_paths = [File.join(abseil_recipe.path, 'lib'), File.join(re2_recipe.path, 'lib')]
+  add_static_ldflags(flags, lib_paths)
+  build_extension(true)
+end
+
+if config_system_libraries?
+  build_with_system_libraries
+else
+  build_with_vendored_libraries
+end
+
 create_makefile("re2")

data/ext/re2/recipes.rb

@@ -0,0 +1,43 @@
+PACKAGE_ROOT_DIR = File.expand_path('../..', __dir__)
+REQUIRED_MINI_PORTILE_VERSION = '~> 2.8.4' # keep this version in sync with the one in the gemspec
+
+def build_recipe(name, version)
+  require 'rubygems'
+  gem('mini_portile2', REQUIRED_MINI_PORTILE_VERSION) # gemspec is not respected at install time
+  require 'mini_portile2'
+
+  MiniPortileCMake.new(name, version).tap do |recipe|
+    recipe.target = File.join(PACKAGE_ROOT_DIR, 'ports')
+    recipe.configure_options += [
+      # abseil needs a C++14 compiler
+      '-DCMAKE_CXX_STANDARD=17',
+      # needed for building the C extension shared library with -fPIC
+      '-DCMAKE_POSITION_INDEPENDENT_CODE=ON',
+      # ensures pkg-config and installed libraries will be in lib, not lib64
+      '-DCMAKE_INSTALL_LIBDIR=lib'
+    ]
+
+    yield recipe
+  end
+end
+
+def load_recipes
+  require 'yaml'
+  dependencies = YAML.load_file(File.join(PACKAGE_ROOT_DIR, 'dependencies.yml'))
+
+  abseil_recipe = build_recipe('abseil', dependencies['abseil']['version']) do |recipe|
+    recipe.files = [{
+      url: "https://github.com/abseil/abseil-cpp/archive/refs/tags/#{recipe.version}.tar.gz",
+      sha256: dependencies['abseil']['sha256']
+    }]
+  end
+
+  re2_recipe = build_recipe('libre2', dependencies['libre2']['version']) do |recipe|
+    recipe.files = [{
+      url: "https://github.com/google/re2/releases/download/#{recipe.version}/re2-#{recipe.version}.tar.gz",
+      sha256: dependencies['libre2']['sha256']
+    }]
+  end
+
+  [abseil_recipe, re2_recipe]
+end

data/lib/re2/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module RE2
+  VERSION = "2.0.0.beta2"
+end

data/lib/re2.rb

@@ -3,5 +3,12 @@
 #
 # Copyright (c) 2010-2014, Paul Mucur (http://mudge.name)
 # Released under the BSD Licence, please see LICENSE.txt
-require "re2.so"
+begin
+  ::RUBY_VERSION =~ /(\d+\.\d+)/
+  require_relative "#{Regexp.last_match(1)}/re2.so"
+rescue LoadError
+  require 're2.so'
+end
+
 require "re2/scanner"
+require "re2/version"

data/re2.gemspec

@@ -0,0 +1,43 @@
+require_relative 'lib/re2/version'
+
+Gem::Specification.new do |s|
+  s.name = "re2"
+  s.summary = "Ruby bindings to re2."
+  s.description = 'Ruby bindings to re2, "an efficient, principled regular expression library".'
+  s.version = RE2::VERSION
+  s.authors = ["Paul Mucur", "Stan Hu"]
+  s.homepage = "https://github.com/mudge/re2"
+  s.extensions = ["ext/re2/extconf.rb"]
+  s.license = "BSD-3-Clause"
+  s.required_ruby_version = ">= 2.6.0"
+  s.files = [
+    ".rspec",
+    "dependencies.yml",
+    "ext/re2/extconf.rb",
+    "ext/re2/re2.cc",
+    "ext/re2/recipes.rb",
+    "Gemfile",
+    "lib/re2.rb",
+    "lib/re2/scanner.rb",
+    "lib/re2/string.rb",
+    "lib/re2/version.rb",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "re2.gemspec"
+  ]
+  s.test_files = [
+    "spec/spec_helper.rb",
+    "spec/re2_spec.rb",
+    "spec/kernel_spec.rb",
+    "spec/re2/regexp_spec.rb",
+    "spec/re2/match_data_spec.rb",
+    "spec/re2/string_spec.rb",
+    "spec/re2/set_spec.rb",
+    "spec/re2/scanner_spec.rb"
+  ]
+  s.add_development_dependency "rake-compiler", "~> 1.2.1"
+  s.add_development_dependency "rake-compiler-dock", "~> 1.3.0"
+  s.add_development_dependency("rspec", "~> 3.2")
+  s.add_runtime_dependency("mini_portile2", "~> 2.8.4") # keep version in sync with extconf.rb
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Paul Mucur
-autorequire:
+- Stan Hu
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -16,14 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -38,21 +53,43 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: mini_portile2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.4
 description: Ruby bindings to re2, "an efficient, principled regular expression library".
-email:
+email: 
 executables: []
 extensions:
 - ext/re2/extconf.rb
 extra_rdoc_files: []
 files:
+- ".rspec"
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- dependencies.yml
 - ext/re2/extconf.rb
 - ext/re2/re2.cc
+- ext/re2/recipes.rb
 - lib/re2.rb
 - lib/re2/scanner.rb
 - lib/re2/string.rb
+- lib/re2/version.rb
+- ports/archives/20230125.3.tar.gz
+- ports/archives/re2-2023-09-01.tar.gz
+- re2.gemspec
 - spec/kernel_spec.rb
 - spec/re2/match_data_spec.rb
 - spec/re2/regexp_spec.rb
@@ -65,7 +102,7 @@ homepage: https://github.com/mudge/re2
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -73,15 +110,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Ruby bindings to re2.
 test_files: