re2 2.9.0-arm-linux → 2.11.0-arm-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f227cc8d79c0519e0c4c352f7116e12d8274b91649e4b706f627c9b6e76480d2
-  data.tar.gz: d5a717030d4db1a8c8f0e5428ef22f4e25f80c3a6e0e327f6704208f6d15249c
+  metadata.gz: 8f3397f07500baa712850b387845ced2d1bb5ab50ff18ab7519c0d2495c1b9c3
+  data.tar.gz: d94aae4403535343fbc82d324c2e5af133bb8477975af61f32dc56c8f57719de
 SHA512:
-  metadata.gz: 62bb2d81c8955cec23e78f998ede72ebb632be6cb36de77898a1afcc6ca2fcf710b4580d633bace43796cd38bacc503cde85041689a62566a38416194beebd19
-  data.tar.gz: 85c978ada3fb9a0bf4f8059eee84bd1207f5546ca03f9dced26d16591e23eb392029bdc9b0eddb70174596cb7c8098785205d10278c5133786c35f2fd2a9438b
+  metadata.gz: ce9c590e328b0ca2e6151edc52040f17df5532d0a1fc22504b0cf63b15055244824bdf9be69e41a7a72e25a78496c8681b60413ac6b8b0e6bc73503c1a4e4375
+  data.tar.gz: 56e18cabff3b750029f704f781d3b175f8cab303fe0899eca032dfe49320f39085ddad7c7b7270ab7ab63f92b7f44778e065fe33292a892648a92c6355e088bc

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec

data/README.md

@@ -6,8 +6,8 @@ Python".
 
 [![Build Status](https://github.com/mudge/re2/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/mudge/re2/actions)
 
-**Current version:** 2.9.0  
-**Bundled RE2 version:** libre2.11 (2024-03-01)  
+**Current version:** 2.11.0  
+**Bundled RE2 version:** libre2.11 (2024-05-01)  
 
 ```ruby
 RE2('h.*o').full_match?("hello")    #=> true
@@ -261,7 +261,7 @@ This gem requires the following to run:
 
 It supports the following RE2 ABI versions:
 
-* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2024-03-01)
+* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2024-05-01)
 
 ### Native gems
 
@@ -279,18 +279,18 @@ Where possible, a pre-compiled native gem will be provided for the following pla
 SHA256 checksums are included in the [release notes](https://github.com/mudge/re2/releases) for each version and can be checked with `sha256sum`, e.g.
 
 ```console
-$ gem fetch re2 -v 2.8.0
-Fetching re2-2.8.0-arm64-darwin.gem
-Downloaded re2-2.8.0-arm64-darwin
-$ sha256sum re2-2.8.0-arm64-darwin.gem
-962bad5c8de0757b059eff8922c3de31830a6710c418a83f2eab2b8253b8a0bf  re2-2.8.0-arm64-darwin.gem
+$ gem fetch re2 -v 2.10.0
+Fetching re2-2.10.0-arm64-darwin.gem
+Downloaded re2-2.10.0-arm64-darwin
+$ sha256sum re2-2.10.0-arm64-darwin.gem
+b0faba64963f04734b2a08cd81a5064733796bb33ab135d46fea2b65c16fe2fa  re2-2.10.0-arm64-darwin.gem
 ```
 
 [GPG](https://www.gnupg.org/) signatures are attached to each release (the assets ending in `.sig`) and can be verified if you import [our signing key `0x39AC3530070E0F75`](https://mudge.name/39AC3530070E0F75.asc) (or fetch it from a public keyserver, e.g. `gpg --keyserver keyserver.ubuntu.com --recv-key 0x39AC3530070E0F75`):
 
 ```console
-$ gpg --verify re2-2.8.0-arm64-darwin.gem.sig re2-2.8.0-arm64-darwin.gem
-gpg: Signature made Wed 31 Jan 15:02:06 2024 GMT
+$ gpg --verify re2-2.10.0-arm64-darwin.gem.sig re2-2.10.0-arm64-darwin.gem
+gpg: Signature made Mon  1 Apr 12:50:24 2024 BST
 gpg:                using RSA key 702609D9C790F45B577D7BEC39AC3530070E0F75
 gpg: Good signature from "Paul Mucur <mudge@mudge.name>" [unknown]
 gpg:                 aka "Paul Mucur <paul@ghostcassette.com>" [unknown]

data/Rakefile

@@ -1,40 +1,23 @@
 # frozen_string_literal: true
 
 require 'rake/extensiontask'
-require 'rspec/core/rake_task'
 require 'rake_compiler_dock'
-require 'yaml'
+require 'rspec/core/rake_task'
 
 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_gemspec = Gem::Specification.load('re2.gemspec')
+abseil_recipe, re2_recipe = load_recipes
 
-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
+# Add Abseil and RE2's latest archives to the gem files. (Note these will be
+# removed from the precompiled native gems.)
+abseil_archive = File.join("ports/archives", File.basename(abseil_recipe.files[0][:url]))
+re2_archive = File.join("ports/archives", File.basename(re2_recipe.files[0][:url]))
 
-task gem: :prepare
+re2_gemspec.files << abseil_archive
+re2_gemspec.files << re2_archive
 
-Gem::PackageTask.new(RE2_GEM_SPEC) do |p|
-  p.need_zip = false
-  p.need_tar = false
-end
-
-CROSS_RUBY_VERSIONS = %w[3.3.0 3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(':')
-CROSS_RUBY_PLATFORMS = %w[
+cross_platforms = %w[
   aarch64-linux
   arm-linux
   arm64-darwin
@@ -46,13 +29,15 @@ CROSS_RUBY_PLATFORMS = %w[
   x86_64-linux
 ].freeze
 
-ENV['RUBY_CC_VERSION'] = CROSS_RUBY_VERSIONS
+ENV['RUBY_CC_VERSION'] = %w[3.3.0 3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(':')
 
-Rake::ExtensionTask.new('re2', RE2_GEM_SPEC) do |e|
+Gem::PackageTask.new(re2_gemspec).define
+
+Rake::ExtensionTask.new('re2', re2_gemspec) 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_platform = cross_platforms
   e.cross_compiling do |spec|
     spec.files.reject! { |path| File.fnmatch?('ports/*', path) }
     spec.dependencies.reject! { |dep| dep.name == 'mini_portile2' }
@@ -61,72 +46,34 @@ end
 
 RSpec::Core::RakeTask.new(: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
+namespace :gem do
+  cross_platforms.each do |platform|
 
-  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"
+    # Compile each platform's native gem, packaging up the result. Note we add
+    # /usr/local/bin to the PATH as it contains the newest version of CMake in
+    # the rake-compiler-dock images.
+    desc "Compile and 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}
+        bundle exec rake native:#{platform} pkg/#{re2_gemspec.full_name}-#{Gem::Platform.new(platform)}.gem PATH="/usr/local/bin:$PATH"
       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
+# Set up file tasks for Abseil and RE2's archives so they are automatically
+# downloaded when required by the gem task.
+file abseil_archive do
+  abseil_recipe.download
 end
 
-def gem_build_path
-  File.join 'pkg', RE2_GEM_SPEC.full_name
+file re2_archive do
+  re2_recipe.download
 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: :spec
 
-task default: [:compile, :spec]
+CLEAN.add("lib/**/*.{o,so,bundle}", "pkg")
+CLOBBER.add("ports")

data/dependencies.yml

@@ -1,7 +1,7 @@
 ---
 libre2:
-  version: '2024-03-01'
-  sha256: 7b2b3aa8241eac25f674e5b5b2e23d4ac4f0a8891418a2661869f736f03f57f4
+  version: '2024-05-01'
+  sha256: fef2f366578401eada34f5603679fb2aebe9b409de8d275a482ce5f2cbac2492
 abseil:
-  version: '20240116.1'
-  sha256: 3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a
+  version: '20240116.2'
+  sha256: 733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc

data/ext/re2/extconf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # re2 (https://github.com/mudge/re2)
 # Ruby bindings to RE2, a "fast, safe, thread-friendly alternative to
 # backtracking regular expression engines like those used in PCRE, Perl, and
@@ -9,370 +11,322 @@
 require 'mkmf'
 require_relative 'recipes'
 
-RE2_HELP_MESSAGE = <<~HELP
-  USAGE: ruby #{$0} [options]
+module RE2
+  class Extconf
+    def configure
+      configure_cross_compiler
 
-    Flags that are always valid:
+      if config_system_libraries?
+        build_with_system_libraries
+      else
+        build_with_vendored_libraries
+      end
 
-      --enable-system-libraries
-          Use system libraries instead of building and using the packaged libraries.
+      build_extension
 
-      --disable-system-libraries
-          Use the packaged libraries, and ignore the system libraries. This is the default.
+      create_makefile("re2")
+    end
 
+    def print_help
+      print(<<~TEXT)
+        USAGE: ruby #{$0} [options]
 
-    Flags only used when using system libraries:
+          Flags that are always valid:
 
-      Related to re2 library:
+            --enable-system-libraries
+                Use system libraries instead of building and using the packaged libraries.
 
-        --with-re2-dir=DIRECTORY
-            Look for re2 headers and library in DIRECTORY.
+            --disable-system-libraries
+                Use the packaged libraries, and ignore the system libraries. This is the default.
 
 
-    Flags only used when building and using the packaged libraries:
+          Flags only used when using system libraries:
 
-      --enable-cross-build
-          Enable cross-build mode. (You probably do not want to set this manually.)
+            Related to re2 library:
 
+              --with-re2-dir=DIRECTORY
+                  Look for re2 headers and library in DIRECTORY.
 
-    Environment variables used:
 
-      CC
-          Use this path to invoke the compiler instead of `RbConfig::CONFIG['CC']`
+          Flags only used when building and using the packaged libraries:
 
-      CPPFLAGS
-          If this string is accepted by the C preprocessor, add it to the flags passed to the C preprocessor
+            --enable-cross-build
+                Enable cross-build mode. (You probably do not want to set this manually.)
 
-      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
+          Environment variables used:
 
-      LIBS
-          Add this string to the flags passed to the linker
-HELP
+            CC
+                Use this path to invoke the compiler instead of `RbConfig::CONFIG['CC']`
 
-#
-#  utility functions
-#
-def config_system_libraries?
-  enable_config("system-libraries", ENV.key?('RE2_USE_SYSTEM_LIBRARIES'))
-end
+            CPPFLAGS
+                If this string is accepted by the C preprocessor, add it to the flags passed to the C preprocessor
 
-def config_cross_build?
-  enable_config("cross-build")
-end
+            CFLAGS
+                If this string is accepted by the compiler, add it to the flags passed to the compiler
 
-def concat_flags(*args)
-  args.compact.join(" ")
-end
+            LDFLAGS
+                If this string is accepted by the linker, add it to the flags passed to the linker
 
-def do_help
-  print(RE2_HELP_MESSAGE)
-  exit!(0)
-end
+            LIBS
+                Add this string to the flags passed to the linker
+      TEXT
+    end
 
-def darwin?
-  RbConfig::CONFIG["target_os"].include?("darwin")
-end
+    private
 
-def windows?
-  RbConfig::CONFIG["target_os"].match?(/mingw|mswin/)
-end
+    def configure_cross_compiler
+      RbConfig::CONFIG["CC"] = RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
+      RbConfig::CONFIG["CXX"] = RbConfig::MAKEFILE_CONFIG["CXX"] = ENV["CXX"] if ENV["CXX"]
+    end
 
-def freebsd?
-  RbConfig::CONFIG["target_os"].include?("freebsd")
-end
+    def build_with_system_libraries
+      header_dirs = [
+        "/usr/local/include",
+        "/opt/homebrew/include",
+        "/usr/include"
+      ]
 
-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
+      lib_dirs = [
+        "/usr/local/lib",
+        "/opt/homebrew/lib",
+        "/usr/lib"
+      ]
 
-def target_arch
-  RbConfig::CONFIG['arch']
-end
+      dir_config("re2", header_dirs, lib_dirs)
 
-def with_temp_dir
-  Dir.mktmpdir do |temp_dir|
-    Dir.chdir(temp_dir) do
-      yield
+      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
     end
-  end
-end
 
-#
-#  main
-#
-do_help if arg_config('--help')
+    def build_with_vendored_libraries
+      message "Building re2 using packaged libraries.\n"
 
-if ENV["CC"]
-  RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"]
-  RbConfig::CONFIG["CC"] = ENV["CC"]
-end
+      abseil_recipe, re2_recipe = load_recipes
 
-if ENV["CXX"]
-  RbConfig::MAKEFILE_CONFIG["CXX"] = ENV["CXX"]
-  RbConfig::CONFIG["CXX"] = ENV["CXX"]
-end
+      process_recipe(abseil_recipe) do |recipe|
+        recipe.configure_options << '-DABSL_PROPAGATE_CXX_STD=ON'
+        # Workaround for https://github.com/abseil/abseil-cpp/issues/1510
+        recipe.configure_options << '-DCMAKE_CXX_FLAGS=-DABSL_FORCE_WAITER_MODE=4' if MiniPortile.windows?
+      end
 
-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"
+      process_recipe(re2_recipe) do |recipe|
+        recipe.configure_options += [
+          # Specify Abseil's path so RE2 will prefer that over any system Abseil
+          "-DCMAKE_PREFIX_PATH=#{abseil_recipe.path}",
+          '-DCMAKE_CXX_FLAGS=-DNDEBUG'
+        ]
+      end
 
-  # 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++"
+      pc_file = File.join(re2_recipe.lib_path, 'pkgconfig', 're2.pc')
+      pkg_config_paths = [
+        File.join(abseil_recipe.lib_path, 'pkgconfig'),
+        File.join(re2_recipe.lib_path, 'pkgconfig')
+      ]
 
-  have_library("stdc++")
-  have_header("stdint.h")
-  have_func("rb_gc_mark_movable") # introduced in Ruby 2.7
+      static_pkg_config(pc_file, pkg_config_paths)
+    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
+    def build_extension
+      # Enable optional warnings but disable deprecated register warning for Ruby 2.6 support
+      $CFLAGS << " -Wall -Wextra -funroll-loops"
+      $CXXFLAGS << " -Wall -Wextra -funroll-loops"
+      $CPPFLAGS << " -Wno-register"
 
-  minimal_program = <<SRC
-#include <re2/re2.h>
-int main() { return 0; }
-SRC
+      # 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++"
 
-  re2_requires_version_flag = checking_for("re2 that requires explicit C++ version flag") do
-    !try_compile(minimal_program, compile_options)
-  end
+      have_library("stdc++")
+      have_header("stdint.h")
+      have_func("rb_gc_mark_movable") # introduced in Ruby 2.7
+
+      minimal_program = <<~SRC
+        #include <re2/re2.h>
+        int main() { return 0; }
+      SRC
 
-  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
+      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}"
+
+              true
+            end
+          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
-#include <re2/re2.h>
-
-int main() {
-  RE2 pattern("test");
-  re2::StringPiece *match;
-  pattern.Match("test", 0, 0, RE2::UNANCHORED, match, 0);
-
-  return 0;
-}
-SRC
-
-    if try_compile(test_re2_match_signature, compile_options)
-      $defs.push("-DHAVE_ENDPOS_ARGUMENT")
-    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
+          #include <re2/re2.h>
+
+          int main() {
+            RE2 pattern("test");
+            re2::StringPiece *match;
+            pattern.Match("test", 0, 0, RE2::UNANCHORED, match, 0);
+
+            return 0;
+          }
+        SRC
+
+        if try_compile(test_re2_match_signature, compile_options)
+          $defs.push("-DHAVE_ENDPOS_ARGUMENT")
+        end
+      end
 
-  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>
+      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>
 
-int main() {
-  RE2::Set s(RE2::DefaultOptions, RE2::UNANCHORED);
-  s.Add("foo", NULL);
-  s.Compile();
+          int main() {
+            RE2::Set s(RE2::DefaultOptions, RE2::UNANCHORED);
+            s.Add("foo", NULL);
+            s.Compile();
 
-  std::vector<int> v;
-  RE2::Set::ErrorInfo ei;
-  s.Match("foo", &v, &ei);
+            std::vector<int> v;
+            RE2::Set::ErrorInfo ei;
+            s.Match("foo", &v, &ei);
 
-  return 0;
-}
-SRC
+            return 0;
+          }
+        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
-  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
+    def static_pkg_config(pc_file, pkg_config_paths)
+      ENV["PKG_CONFIG_PATH"] = [*pkg_config_paths, ENV["PKG_CONFIG_PATH"]].compact.join(File::PATH_SEPARATOR)
+
+      static_library_paths = minimal_pkg_config(pc_file, '--libs-only-L', '--static')
+        .shellsplit
+        .map { |flag| flag.delete_prefix('-L') }
+
+      # Replace all -l flags that can be found in one of the static library
+      # paths with the absolute path instead.
+      minimal_pkg_config(pc_file, '--libs-only-l', '--static')
+        .shellsplit
+        .each do |flag|
+          lib = "lib#{flag.delete_prefix('-l')}.#{$LIBEXT}"
+
+          if (static_lib_path = static_library_paths.find { |path| File.exist?(File.join(path, lib)) })
+            $libs << ' ' << File.join(static_lib_path, lib).shellescape
+          else
+            $libs << ' ' << flag.shellescape
+          end
+        end
 
-  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
+      append_ldflags(minimal_pkg_config(pc_file, '--libs-only-other', '--static'))
 
-    unless recipe.patch_files.empty?
-      message("The following patches are being applied:\n")
+      incflags = minimal_pkg_config(pc_file, '--cflags-only-I')
+      $INCFLAGS = [incflags, $INCFLAGS].join(" ").strip
 
-      recipe.patch_files.each do |patch|
-        message("  - %s\n" % File.basename(patch))
-      end
+      cflags = minimal_pkg_config(pc_file, '--cflags-only-other')
+      $CFLAGS = [$CFLAGS, cflags].join(" ").strip
+      $CXXFLAGS = [$CXXFLAGS, cflags].join(" ").strip
     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
+    def process_recipe(recipe)
+      cross_build_p = config_cross_build?
+      message "Cross build is #{cross_build_p ? "enabled" : "disabled"}.\n"
 
-  recipe.activate
-end
+      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
 
-def build_with_system_libraries
-  header_dirs = [
-    "/usr/local/include",
-    "/opt/homebrew/include",
-    "/usr/include"
-  ]
+      yield recipe
 
-  lib_dirs = [
-    "/usr/local/lib",
-    "/opt/homebrew/lib",
-    "/usr/lib"
-  ]
+      checkpoint = "#{recipe.target}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
+      name = recipe.name
+      version = recipe.version
 
-  dir_config("re2", header_dirs, lib_dirs)
+      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
 
-  build_extension
-end
+        # Use a temporary base directory to reduce filename lengths since
+        # Windows can hit a limit of 250 characters (CMAKE_OBJECT_PATH_MAX).
+        Dir.mktmpdir { |dir| Dir.chdir(dir) { recipe.cook } }
 
-def libflag_to_filename(ldflag)
-  case ldflag
-  when /\A-l(.+)/
-    "lib#{Regexp.last_match(1)}.#{$LIBEXT}"
-  end
-end
+        FileUtils.touch(checkpoint)
+      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
+    # See MiniPortile2's minimal_pkg_config:
+    # https://github.com/flavorjones/mini_portile/blob/52fb0bc41c89a10f1ac7b5abcf0157e059194374/lib/mini_portile2/mini_portile.rb#L760-L783
+    # and Ruby's pkg_config:
+    # https://github.com/ruby/ruby/blob/c505bb0ca0fd61c7ae931d26451f11122a2644e9/lib/mkmf.rb#L1916-L2004
+    def minimal_pkg_config(pc_file, *options)
+      if ($PKGCONFIG ||=
+          (pkgconfig = MakeMakefile.with_config("pkg-config") {MakeMakefile.config_string("PKG_CONFIG") || "pkg-config"}) &&
+          MakeMakefile.find_executable0(pkgconfig) && pkgconfig)
+        pkgconfig = $PKGCONFIG
       else
-        $LIBPATH | [lib_dir]
+        raise RuntimeError, "pkg-config is not found"
       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)
+      response = xpopen([pkgconfig, *options, pc_file], err: %i[child out], &:read)
+      raise RuntimeError, response unless $?.success?
 
-      $LDFLAGS << " " << static_lib
-      added = true
-      break
+      response.strip
     end
 
-    append_ldflags(arg.shellescape) unless added
-  else
-    append_ldflags(arg.shellescape)
-  end
-end
-
-def add_static_ldflags(flags, lib_paths)
-  flags.strip.shellsplit.each { |flag| add_flag(flag, lib_paths) }
-end
-
-def build_with_vendored_libraries
-  message "Building re2 using packaged libraries.\n"
+    def config_system_libraries?
+      enable_config("system-libraries", ENV.key?('RE2_USE_SYSTEM_LIBRARIES'))
+    end
 
-  abseil_recipe, re2_recipe = load_recipes
+    def config_cross_build?
+      enable_config("cross-build")
+    end
 
-  process_recipe(abseil_recipe) do |recipe|
-    recipe.configure_options += ['-DABSL_PROPAGATE_CXX_STD=ON', '-DCMAKE_CXX_VISIBILITY_PRESET=hidden']
-    # Workaround for https://github.com/abseil/abseil-cpp/issues/1510
-    recipe.configure_options += ['-DCMAKE_CXX_FLAGS=-DABSL_FORCE_WAITER_MODE=4'] if windows?
-  end
+    # 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).
+    def target_host
+      host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
+      host.gsub(/i386/, "i686")
+    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']
+    def target_arch
+      RbConfig::CONFIG['arch']
+    end
   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
+extconf = RE2::Extconf.new
+
+if arg_config('--help')
+  extconf.print_help
+  exit!(true)
 end
 
-create_makefile("re2")
+extconf.configure

data/ext/re2/recipes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # re2 (https://github.com/mudge/re2)
 # Ruby bindings to RE2, a "fast, safe, thread-friendly alternative to
 # backtracking regular expression engines like those used in PCRE, Perl, and
@@ -7,27 +9,7 @@
 # Released under the BSD Licence, please see LICENSE.txt
 
 PACKAGE_ROOT_DIR = File.expand_path('../..', __dir__)
-REQUIRED_MINI_PORTILE_VERSION = '~> 2.8.5' # 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=14',
-      # 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
+REQUIRED_MINI_PORTILE_VERSION = '~> 2.8.6' # keep this version in sync with the one in the gemspec
 
 def load_recipes
   require 'yaml'
@@ -49,3 +31,24 @@ def load_recipes
 
   [abseil_recipe, re2_recipe]
 end
+
+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=14',
+      # 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',
+      '-DCMAKE_CXX_VISIBILITY_PRESET=hidden'
+    ]
+
+    yield recipe
+  end
+end

data/lib/re2/regexp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # re2 (https://github.com/mudge/re2)
 # Ruby bindings to RE2, a "fast, safe, thread-friendly alternative to
 # backtracking regular expression engines like those used in PCRE, Perl, and

data/lib/re2/scanner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # re2 (https://github.com/mudge/re2)
 # Ruby bindings to RE2, a "fast, safe, thread-friendly alternative to
 # backtracking regular expression engines like those used in PCRE, Perl, and

data/lib/re2/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # re2 (https://github.com/mudge/re2)
 # Ruby bindings to RE2, a "fast, safe, thread-friendly alternative to
 # backtracking regular expression engines like those used in PCRE, Perl, and

data/lib/re2/version.rb

@@ -10,5 +10,5 @@
 
 
 module RE2
-  VERSION = "2.9.0"
+  VERSION = "2.11.0"
 end

data/lib/re2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # re2 (https://github.com/mudge/re2)
 # Ruby bindings to RE2, a "fast, safe, thread-friendly alternative to
 # backtracking regular expression engines like those used in PCRE, Perl, and

data/re2.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'lib/re2/version'
 
 Gem::Specification.new do |s|
@@ -38,8 +40,8 @@ Gem::Specification.new do |s|
     "spec/re2/set_spec.rb",
     "spec/re2/scanner_spec.rb"
   ]
-  s.add_development_dependency("rake-compiler", "~> 1.2.5")
-  s.add_development_dependency("rake-compiler-dock", "~> 1.4.0")
+  s.add_development_dependency("rake-compiler", "~> 1.2.7")
+  s.add_development_dependency("rake-compiler-dock", "~> 1.5.0")
   s.add_development_dependency("rspec", "~> 3.2")
-  s.add_runtime_dependency("mini_portile2", "~> 2.8.5") # keep version in sync with extconf.rb
+  s.add_runtime_dependency("mini_portile2", "~> 2.8.6") # keep version in sync with extconf.rb
 end

data/spec/kernel_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Kernel do
   describe ".RE2" do
     it "returns an RE2::Regexp instance given a pattern" do

data/spec/re2/match_data_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'objspace'
 
 RSpec.describe RE2::MatchData do
@@ -142,7 +143,7 @@ RSpec.describe RE2::MatchData do
     end
 
     it "returns a copy, not the actual original" do
-      string = "bob"
+      string = +"bob"
       re = RE2::Regexp.new('(\D+)').match(string)
 
       expect(re.string).to_not equal(string)
@@ -155,7 +156,7 @@ RSpec.describe RE2::MatchData do
     end
 
     it "does not copy the string if it was already frozen" do
-      string = "bob".freeze
+      string = "bob"
       re = RE2::Regexp.new('(\D+)').match(string)
 
       expect(re.string).to equal(string)

data/spec/re2/regexp_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RE2::Regexp do
   describe "#initialize" do
     it "returns an instance given only a pattern" do

data/spec/re2/scanner_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 RSpec.describe RE2::Scanner do
   describe "#regexp" do

data/spec/re2/set_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RE2::Set do
   describe "#initialize" do
     it "returns an instance given no args" do

data/spec/re2/string_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "re2/string"
 
 class String

data/spec/re2_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RE2 do
   describe ".Replace" do
     it "only replaces the first occurrence of the pattern" do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "re2"
 
 # To test passing objects that can be coerced to a String.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.11.0
 platform: arm-linux
 authors:
 - Paul Mucur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement