re2 2.4.3-arm64-darwin → 2.6.0-arm64-darwin

data/ext/re2/extconf.rb

@@ -1,7 +1,9 @@
-# re2 (http://github.com/mudge/re2)
-# Ruby bindings to re2, an "efficient, principled regular expression library"
+# 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
+# Python".
 #
-# Copyright (c) 2010-2012, Paul Mucur (http://mudge.name)
+# Copyright (c) 2010, Paul Mucur (https://mudge.name)
 # Released under the BSD Licence, please see LICENSE.txt
 
 require 'mkmf'
@@ -271,65 +273,6 @@ def build_with_system_libraries
   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_raw_hash_set
-  -labsl_hash
-  -labsl_city
-  -labsl_bad_variant_access
-  -labsl_low_level_hash
-  -labsl_hashtablez_sampler
-  -labsl_exponential_biased
-  -labsl_bad_optional_access
-  -labsl_str_format_internal
-  -labsl_synchronization
-  -labsl_graphcycles_internal
-  -labsl_kernel_timeout_internal
-  -labsl_stacktrace
-  -labsl_symbolize
-  -ldbghelp
-  -labsl_debugging_internal
-  -labsl_demangle_internal
-  -labsl_malloc_internal
-  -labsl_time
-  -labsl_civil_time
-  -labsl_strings
-  -labsl_string_view
-  -labsl_strings_internal
-  -labsl_base
-  -ladvapi32
-  -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(.+)/
@@ -382,14 +325,7 @@ def add_flag(arg, lib_paths)
 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
+  flags.strip.shellsplit.each { |flag| add_flag(flag, lib_paths) }
 end
 
 def build_with_vendored_libraries