re2 1.21.4 → 1.22.0

package/LICENSE

@@ -7,7 +7,7 @@ The text of the BSD license is reproduced below.
 The "New" BSD License:
 **********************
 
-Copyright (c) 2005-2024, Eugene Lazutkin
+Copyright (c) 2005-2025, Eugene Lazutkin
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

package/README.md

@@ -351,8 +351,18 @@ console.log('re2_res : ' + re2_res); // prints: re2_res : abc,a,b,c
 
 `RE2` always works in the Unicode mode. See `RE2.unicodeWarningLevel` above for more details on how to control warnings about this feature.
 
+#### Unicode classes
+
+`RE2` supports a subset of Unicode classes as defined in [RE2 Syntax](https://github.com/google/re2/wiki/Syntax). Native Google RE2 supports only short names, e.g., `L` for `Letter`, `N` for `Number`, etc. Like `RegExp`, `RE2` supports both short and long names, e.g., `Letter` for `L`, by translating them to short names.
+
+The extended form `\p{name=value}` is not supported. Only form `\p{name}` is supported.
+
+The same applies to `\P{name}`.
+
 ## Release history
 
+- 1.22.0 *Added support for translation of Unicode classes (thx, [John Livingston](https://github.com/JohnXLivingston)). Added [attestations](https://github.com/uhop/node-re2/attestations).*
+- 1.21.5 *Updated all dependencies and the list of pre-compiled targets. Fixed minor bugs. C++ style fix (thx, [Benjamin Brienen](https://github.com/BenjaminBrienen)). Added Windows 11 ARM build runner (thx, [Kagami Sascha Rosylight](https://github.com/saschanaz)).*
 - 1.21.4 *Fixed a regression reported by [caroline-matsec](https://github.com/caroline-matsec), thx! Added pre-compilation targets for Alpine Linux on ARM. Updated deps.*
 - 1.21.3 *Fixed an empty string regression reported by [Rhys Arkins](https://github.com/rarkins), thx! Updated deps.*
 - 1.21.2 *Fixed another memory regression reported by [matthewvalentine](https://github.com/matthewvalentine), thx! Updated deps. Added more tests and benchmarks.*

package/binding.gyp

@@ -47,11 +47,14 @@
         "vendor/abseil-cpp/absl/base/internal/thread_identity.cc",
         "vendor/abseil-cpp/absl/base/internal/throw_delegate.cc",
         "vendor/abseil-cpp/absl/base/internal/unscaledcycleclock.cc",
-        "vendor/abseil-cpp/absl/debugging/internal/demangle.cc",
         "vendor/abseil-cpp/absl/container/internal/raw_hash_set.cc",
+        "vendor/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc",
+        "vendor/abseil-cpp/absl/debugging/internal/demangle.cc",
+        "vendor/abseil-cpp/absl/debugging/internal/demangle_rust.cc",
         "vendor/abseil-cpp/absl/debugging/internal/address_is_readable.cc",
         "vendor/abseil-cpp/absl/debugging/internal/elf_mem_image.cc",
         "vendor/abseil-cpp/absl/debugging/internal/examine_stack.cc",
+        "vendor/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc",
         "vendor/abseil-cpp/absl/debugging/internal/vdso_support.cc",
         "vendor/abseil-cpp/absl/debugging/stacktrace.cc",
         "vendor/abseil-cpp/absl/debugging/symbolize.cc",
@@ -72,6 +75,7 @@
         "vendor/abseil-cpp/absl/log/internal/log_sink_set.cc",
         "vendor/abseil-cpp/absl/log/internal/nullguard.cc",
         "vendor/abseil-cpp/absl/log/internal/proto.cc",
+        "vendor/abseil-cpp/absl/log/internal/structured_proto.cc",
         "vendor/abseil-cpp/absl/log/globals.cc",
         "vendor/abseil-cpp/absl/log/log_sink.cc",
         "vendor/abseil-cpp/absl/numeric/int128.cc",

package/lib/accessors.cc

@@ -205,28 +205,24 @@ NAN_SETTER(WrappedRE2::SetUnicodeWarningLevel)
 {
 	if (value->IsString())
 	{
-		auto size = Nan::DecodeBytes(value, Nan::UTF8);
-		std::vector<char> buffer(size + 1);
-		auto data = &buffer[0];
-		Nan::DecodeWrite(data, size, value, Nan::UTF8);
-		buffer[size] = '\0';
-		if (!strcmp(data, "throw"))
+		Nan::Utf8String s(value);
+		if (!strcmp(*s, "throw"))
 		{
 			unicodeWarningLevel = THROW;
 			return;
 		}
-		if (!strcmp(data, "warn"))
+		if (!strcmp(*s, "warn"))
 		{
 			unicodeWarningLevel = WARN;
 			return;
 		}
-		if (!strcmp(data, "warnOnce"))
+		if (!strcmp(*s, "warnOnce"))
 		{
 			unicodeWarningLevel = WARN_ONCE;
 			alreadyWarnedAboutUnicode = false;
 			return;
 		}
-		if (!strcmp(data, "nothing"))
+		if (!strcmp(*s, "nothing"))
 		{
 			unicodeWarningLevel = NOTHING;
 			return;

package/lib/addon.cc

@@ -7,7 +7,8 @@ static NAN_METHOD(GetUtf8Length)
 	{
 		return;
 	}
-	info.GetReturnValue().Set(static_cast<int>(Nan::DecodeBytes(t.ToLocalChecked(), Nan::UTF8)));
+	auto s = t.ToLocalChecked();
+	info.GetReturnValue().Set(static_cast<int>(s->Utf8Length(v8::Isolate::GetCurrent())));
 }
 
 static NAN_METHOD(GetUtf16Length)
@@ -158,10 +159,12 @@ const StrVal &WrappedRE2::prepareArgument(const v8::Local<v8::Value> &arg, bool
 
 	lastString.Reset(arg);
 
+	auto isolate = v8::Isolate::GetCurrent();
+
 	auto s = t.ToLocalChecked();
-	auto argLength = Nan::DecodeBytes(s);
+	auto argLength = s->Utf8Length(isolate);
 
-	auto buffer = node::Buffer::New(v8::Isolate::GetCurrent(), s).ToLocalChecked();
+	auto buffer = node::Buffer::New(isolate, s).ToLocalChecked();
 	lastCache.Reset(buffer);
 
 	auto argSize = node::Buffer::Length(buffer);

package/lib/new.cc

@@ -1,6 +1,7 @@
 #include "./wrapped_re2.h"
 #include "./util.h"
 
+#include <map>
 #include <memory>
 #include <string>
 #include <unordered_set>
@@ -18,6 +19,47 @@ inline bool isHexadecimal(char ch)
 	return ('0' <= ch && ch <= '9') || ('A' <= ch && ch <= 'Z') || ('a' <= ch && ch <= 'z');
 }
 
+static std::map<std::string, std::string> unicodeClasses = {
+	{"Uppercase_Letter", "Lu"},
+	{"Lowercase_Letter", "Ll"},
+	{"Titlecase_Letter", "Lt"},
+	{"Cased_Letter", "LC"},
+	{"Modifier_Letter", "Lm"},
+	{"Other_Letter", "Lo"},
+	{"Letter", "L"},
+	{"Nonspacing_Mark", "Mn"},
+	{"Spacing_Mark", "Mc"},
+	{"Enclosing_Mark", "Me"},
+	{"Mark", "M"},
+	{"Decimal_Number", "Nd"},
+	{"Letter_Number", "Nl"},
+	{"Other_Number", "No"},
+	{"Number", "N"},
+	{"Connector_Punctuation", "Pc"},
+	{"Dash_Punctuation", "Pd"},
+	{"Open_Punctuation", "Ps"},
+	{"Close_Punctuation", "Pe"},
+	{"Initial_Punctuation", "Pi"},
+	{"Final_Punctuation", "Pf"},
+	{"Other_Punctuation", "Po"},
+	{"Punctuation", "P"},
+	{"Math_Symbol", "Sm"},
+	{"Currency_Symbol", "Sc"},
+	{"Modifier_Symbol", "Sk"},
+	{"Other_Symbol", "So"},
+	{"Symbol", "S"},
+	{"Space_Separator", "Zs"},
+	{"Line_Separator", "Zl"},
+	{"Paragraph_Separator", "Zp"},
+	{"Separator", "Z"},
+	{"Control", "Cc"},
+	{"Format", "Cf"},
+	{"Surrogate", "Cs"},
+	{"Private_Use", "Co"},
+	{"Unassigned", "Cn"},
+	{"Other", "C"},
+};
+
 static bool translateRegExp(const char *data, size_t size, bool multiline, std::vector<char> &buffer)
 {
 	std::string result;
@@ -98,6 +140,36 @@ static bool translateRegExp(const char *data, size_t size, bool multiline, std::
 					result += "\\u";
 					i += 2;
 					continue;
+				case 'p':
+				case 'P':
+					if (i + 2 < size) {
+						if (data[i + 2] == '{') {
+							size_t j = i + 3;
+							while (j < size && data[j] != '}') ++j;
+							if (j < size) {
+								result += "\\";
+								result += data[i + 1];
+								std::string name(data + i + 3, j - i - 3);
+								if (unicodeClasses.find(name) != unicodeClasses.end()) {
+									name = unicodeClasses[name];
+								}
+								if (name.size() == 1) {
+									result += name;
+								} else {
+									result += "{";
+									result += name;
+									result += "}";
+								}
+								i = j + 1;
+								changed = true;
+								continue;
+							}
+						}
+					}
+					result += "\\";
+					result += data[i + 1];
+					i += 2;
+					continue;
 				default:
 					result += "\\";
 					size_t sym_size = getUtf8CharSize(ch);
@@ -241,10 +313,13 @@ NAN_METHOD(WrappedRE2::New)
 	{
 		if (info[1]->IsString())
 		{
-			size = Nan::DecodeBytes(info[1], Nan::UTF8);
+			auto isolate = v8::Isolate::GetCurrent();
+			auto t = info[1]->ToString(Nan::GetCurrentContext());
+			auto s = t.ToLocalChecked();
+			size = s->Utf8Length(isolate);
 			buffer.resize(size + 1);
 			data = &buffer[0];
-			Nan::DecodeWrite(data, size, info[1], Nan::UTF8);
+			s->WriteUtf8(isolate, data, buffer.size());
 			buffer[size] = '\0';
 		}
 		else if (node::Buffer::HasInstance(info[1]))
@@ -296,11 +371,13 @@ NAN_METHOD(WrappedRE2::New)
 	{
 		const auto *re = v8::RegExp::Cast(*info[0]);
 
-		auto t = re->GetSource();
-		size = Nan::DecodeBytes(t, Nan::UTF8);
+		auto isolate = v8::Isolate::GetCurrent();
+		auto t = re->GetSource()->ToString(Nan::GetCurrentContext());
+		auto s = t.ToLocalChecked();
+		size = s->Utf8Length(isolate);
 		buffer.resize(size + 1);
 		data = &buffer[0];
-		Nan::DecodeWrite(data, size, t, Nan::UTF8);
+		s->WriteUtf8(isolate, data, buffer.size());
 		buffer[size] = '\0';
 
 		source = escapeRegExp(data, size);
@@ -352,10 +429,13 @@ NAN_METHOD(WrappedRE2::New)
 	}
 	else if (info[0]->IsString())
 	{
-		size = Nan::DecodeBytes(info[0], Nan::UTF8);
+		auto isolate = v8::Isolate::GetCurrent();
+		auto t = info[0]->ToString(Nan::GetCurrentContext());
+		auto s = t.ToLocalChecked();
+		size = s->Utf8Length(isolate);
 		buffer.resize(size + 1);
 		data = &buffer[0];
-		Nan::DecodeWrite(data, size, info[0], Nan::UTF8);
+		s->WriteUtf8(isolate, data, buffer.size());
 		buffer[size] = '\0';
 
 		source = escapeRegExp(data, size);

package/lib/wrapped_re2.h

@@ -121,7 +121,7 @@ private:
 	const StrVal &prepareArgument(const v8::Local<v8::Value> &arg, bool ignoreLastIndex = false);
 	void doneWithLastString();
 
-	friend class PrepareLastString;
+	friend struct PrepareLastString;
 };
 
 struct PrepareLastString

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "re2",
-  "version": "1.21.4",
+  "version": "1.22.0",
   "description": "Bindings for RE2: fast, safe alternative to backtracking regular expression engines.",
   "homepage": "https://github.com/uhop/node-re2",
   "bugs": "https://github.com/uhop/node-re2/issues",
@@ -15,14 +15,14 @@
     "vendor"
   ],
   "dependencies": {
-    "install-artifact-from-github": "^1.3.5",
-    "nan": "^2.20.0",
-    "node-gyp": "^10.2.0"
+    "install-artifact-from-github": "^1.4.0",
+    "nan": "^2.22.2",
+    "node-gyp": "^11.2.0"
   },
   "devDependencies": {
-    "@types/node": "^22.5.0",
+    "@types/node": "^22.15.17",
     "heya-unit": "^0.3.0",
-    "typescript": "^5.5.4"
+    "typescript": "^5.8.3"
   },
   "scripts": {
     "test": "node tests/tests.js",

package/vendor/abseil-cpp/BUILD.bazel

@@ -1,4 +1,3 @@
-#
 # Copyright 2020 The Abseil Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,3 +22,14 @@ exports_files([
     "AUTHORS",
     "LICENSE",
 ])
+
+# For building with clang-cl.
+# https://bazel.build/configure/windows#clang
+platform(
+    name = "x64_windows-clang-cl",
+    constraint_values = [
+        "@platforms//cpu:x86_64",
+        "@platforms//os:windows",
+        "@bazel_tools//tools/cpp:clang-cl",
+    ],
+)

package/vendor/abseil-cpp/CMake/AbseilDll.cmake

@@ -28,6 +28,8 @@ set(ABSL_INTERNAL_DLL_FILES
   "base/internal/low_level_scheduling.h"
   "base/internal/nullability_impl.h"
   "base/internal/per_thread_tls.h"
+  "base/internal/poison.cc"
+  "base/internal/poison.h"
   "base/prefetch.h"
   "base/internal/pretty_function.h"
   "base/internal/raw_logging.cc"
@@ -47,6 +49,8 @@ set(ABSL_INTERNAL_DLL_FILES
   "base/internal/thread_identity.h"
   "base/internal/throw_delegate.cc"
   "base/internal/throw_delegate.h"
+  "base/internal/tracing.cc"
+  "base/internal/tracing.h"
   "base/internal/tsan_mutex_interface.h"
   "base/internal/unaligned_access.h"
   "base/internal/unscaledcycleclock.cc"
@@ -66,6 +70,7 @@ set(ABSL_INTERNAL_DLL_FILES
   "cleanup/internal/cleanup.h"
   "container/btree_map.h"
   "container/btree_set.h"
+  "container/hash_container_defaults.h"
   "container/fixed_array.h"
   "container/flat_hash_map.h"
   "container/flat_hash_set.h"
@@ -121,8 +126,13 @@ set(ABSL_INTERNAL_DLL_FILES
   "debugging/symbolize.h"
   "debugging/internal/address_is_readable.cc"
   "debugging/internal/address_is_readable.h"
+  "debugging/internal/bounded_utf8_length_sequence.h"
+  "debugging/internal/decode_rust_punycode.cc"
+  "debugging/internal/decode_rust_punycode.h"
   "debugging/internal/demangle.cc"
   "debugging/internal/demangle.h"
+  "debugging/internal/demangle_rust.cc"
+  "debugging/internal/demangle_rust.h"
   "debugging/internal/elf_mem_image.cc"
   "debugging/internal/elf_mem_image.h"
   "debugging/internal/examine_stack.cc"
@@ -131,6 +141,8 @@ set(ABSL_INTERNAL_DLL_FILES
   "debugging/internal/stack_consumption.h"
   "debugging/internal/stacktrace_config.h"
   "debugging/internal/symbolize.h"
+  "debugging/internal/utf8_for_code_point.cc"
+  "debugging/internal/utf8_for_code_point.h"
   "debugging/internal/vdso_support.cc"
   "debugging/internal/vdso_support.h"
   "functional/any_invocable.h"
@@ -181,6 +193,8 @@ set(ABSL_INTERNAL_DLL_FILES
   "log/internal/proto.cc"
   "log/internal/strip.h"
   "log/internal/structured.h"
+  "log/internal/structured_proto.cc"
+  "log/internal/structured_proto.h"
   "log/internal/vlog_config.cc"
   "log/internal/vlog_config.h"
   "log/internal/voidify.h"
@@ -311,7 +325,6 @@ set(ABSL_INTERNAL_DLL_FILES
   "strings/internal/string_constant.h"
   "strings/internal/stringify_sink.h"
   "strings/internal/stringify_sink.cc"
-  "strings/internal/has_absl_stringify.h"
   "strings/has_absl_stringify.h"
   "strings/has_ostream_operator.h"
   "strings/match.cc"
@@ -437,9 +450,47 @@ set(ABSL_INTERNAL_DLL_FILES
   "debugging/leak_check.cc"
 )
 
+if(NOT MSVC)
+  list(APPEND ABSL_INTERNAL_DLL_FILES
+    "flags/commandlineflag.cc"
+    "flags/commandlineflag.h"
+    "flags/config.h"
+    "flags/declare.h"
+    "flags/flag.h"
+    "flags/internal/commandlineflag.cc"
+    "flags/internal/commandlineflag.h"
+    "flags/internal/flag.cc"
+    "flags/internal/flag.h"
+    "flags/internal/parse.h"
+    "flags/internal/path_util.h"
+    "flags/internal/private_handle_accessor.cc"
+    "flags/internal/private_handle_accessor.h"
+    "flags/internal/program_name.cc"
+    "flags/internal/program_name.h"
+    "flags/internal/registry.h"
+    "flags/internal/sequence_lock.h"
+    "flags/internal/usage.cc"
+    "flags/internal/usage.h"
+    "flags/marshalling.cc"
+    "flags/marshalling.h"
+    "flags/parse.cc"
+    "flags/parse.h"
+    "flags/reflection.cc"
+    "flags/reflection.h"
+    "flags/usage.cc"
+    "flags/usage.h"
+    "flags/usage_config.cc"
+    "flags/usage_config.h"
+    "log/flags.cc"
+    "log/flags.h"
+    "log/internal/flags.h"
+  )
+endif()
+
 set(ABSL_INTERNAL_DLL_TARGETS
   "absl_check"
   "absl_log"
+  "absl_vlog_is_on"
   "algorithm"
   "algorithm_container"
   "any"
@@ -505,6 +556,7 @@ set(ABSL_INTERNAL_DLL_TARGETS
   "log_internal_check_op"
   "log_internal_conditions"
   "log_internal_config"
+  "log_internal_fnmatch"
   "log_internal_format"
   "log_internal_globals"
   "log_internal_log_impl"
@@ -584,6 +636,7 @@ set(ABSL_INTERNAL_DLL_TARGETS
   "strerror"
   "strings"
   "strings_internal"
+  "string_view"
   "symbolize"
   "synchronization"
   "thread_pool"
@@ -594,8 +647,30 @@ set(ABSL_INTERNAL_DLL_TARGETS
   "type_traits"
   "utility"
   "variant"
+  "vlog_config_internal"
+  "vlog_is_on"
 )
 
+if(NOT MSVC)
+  list(APPEND ABSL_INTERNAL_DLL_TARGETS
+    "flags"
+    "flags_commandlineflag"
+    "flags_commandlineflag_internal"
+    "flags_config"
+    "flags_internal"
+    "flags_marshalling"
+    "flags_parse"
+    "flags_path_util"
+    "flags_private_handle_accessor"
+    "flags_program_name"
+    "flags_reflection"
+    "flags_usage"
+    "flags_usage_internal"
+    "log_internal_flags"
+    "log_flags"
+  )
+endif()
+
 set(ABSL_INTERNAL_TEST_DLL_FILES
   "hash/hash_testing.h"
   "log/scoped_mock_log.cc"
@@ -608,6 +683,9 @@ set(ABSL_INTERNAL_TEST_DLL_FILES
   "random/internal/mock_overload_set.h"
   "random/mocking_bit_gen.h"
   "random/mock_distributions.h"
+  "status/status_matchers.h"
+  "status/internal/status_matchers.cc"
+  "status/internal/status_matchers.h"
   "strings/cordz_test_helpers.h"
   "strings/cord_test_helpers.h"
 )
@@ -620,6 +698,7 @@ set(ABSL_INTERNAL_TEST_DLL_TARGETS
   "random_internal_distribution_test_util"
   "random_internal_mock_overload_set"
   "scoped_mock_log"
+  "status_matchers"
 )
 
 include(CheckCXXSourceCompiles)
@@ -668,12 +747,7 @@ function(absl_internal_dll_contains)
 
   STRING(REGEX REPLACE "^absl::" "" _target ${ABSL_INTERNAL_DLL_TARGET})
 
-  list(FIND
-    ABSL_INTERNAL_DLL_TARGETS
-    "${_target}"
-    _index)
-
-  if (${_index} GREATER -1)
+  if (_target IN_LIST ABSL_INTERNAL_DLL_TARGETS)
     set(${ABSL_INTERNAL_DLL_OUTPUT} 1 PARENT_SCOPE)
   else()
     set(${ABSL_INTERNAL_DLL_OUTPUT} 0 PARENT_SCOPE)
@@ -690,12 +764,7 @@ function(absl_internal_test_dll_contains)
 
   STRING(REGEX REPLACE "^absl::" "" _target ${ABSL_INTERNAL_TEST_DLL_TARGET})
 
-  list(FIND
-    ABSL_INTERNAL_TEST_DLL_TARGETS
-    "${_target}"
-    _index)
-
-  if (${_index} GREATER -1)
+  if (_target IN_LIST ABSL_INTERNAL_TEST_DLL_TARGETS)
     set(${ABSL_INTERNAL_TEST_DLL_OUTPUT} 1 PARENT_SCOPE)
   else()
     set(${ABSL_INTERNAL_TEST_DLL_OUTPUT} 0 PARENT_SCOPE)
@@ -747,7 +816,12 @@ function(absl_make_dll)
   else()
     set(_dll "abseil_dll")
     set(_dll_files ${ABSL_INTERNAL_DLL_FILES})
-    set(_dll_libs "")
+    set(_dll_libs
+      Threads::Threads
+      # TODO(#1495): Use $<LINK_LIBRARY:FRAMEWORK,CoreFoundation> once our
+      # minimum CMake version >= 3.24
+      $<$<PLATFORM_ID:Darwin>:-Wl,-framework,CoreFoundation>
+    )
     set(_dll_compile_definitions "")
     set(_dll_includes "")
     set(_dll_consume "ABSL_CONSUME_DLL")
@@ -764,8 +838,12 @@ function(absl_make_dll)
     PRIVATE
       ${_dll_libs}
       ${ABSL_DEFAULT_LINKOPTS}
+      $<$<BOOL:${ANDROID}>:-llog>
+  )
+  set_target_properties(${_dll} PROPERTIES
+    LINKER_LANGUAGE "CXX"
+    SOVERSION ${ABSL_SOVERSION}
   )
-  set_property(TARGET ${_dll} PROPERTY LINKER_LANGUAGE "CXX")
   target_include_directories(
     ${_dll}
     PUBLIC

package/vendor/abseil-cpp/CMake/AbseilHelpers.cmake

@@ -187,7 +187,15 @@ function(absl_cc_library)
       endif()
     endforeach()
     foreach(cflag ${ABSL_CC_LIB_COPTS})
-      if(${cflag} MATCHES "^(-Wno|/wd)")
+      # Strip out the CMake-specific `SHELL:` prefix, which is used to construct
+      # a group of space-separated options.
+      # https://cmake.org/cmake/help/v3.30/command/target_compile_options.html#option-de-duplication
+      string(REGEX REPLACE "^SHELL:" "" cflag "${cflag}")
+      if(${cflag} MATCHES "^-Xarch_")
+        # An -Xarch_ flag implies that its successor only applies to the
+        # specified platform. Such option groups are each specified in a single
+        # `SHELL:`-prefixed string in the COPTS list, which we simply ignore.
+      elseif(${cflag} MATCHES "^(-Wno-|/wd)")
         # These flags are needed to suppress warnings that might fire in our headers.
         set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
       elseif(${cflag} MATCHES "^(-W|/w[1234eo])")
@@ -250,6 +258,13 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
     elseif(_build_type STREQUAL "static" OR _build_type STREQUAL "shared")
       add_library(${_NAME} "")
       target_sources(${_NAME} PRIVATE ${ABSL_CC_LIB_SRCS} ${ABSL_CC_LIB_HDRS})
+      if(APPLE)
+        set_target_properties(${_NAME} PROPERTIES
+          INSTALL_RPATH "@loader_path")
+      elseif(UNIX)
+        set_target_properties(${_NAME} PROPERTIES
+          INSTALL_RPATH "$ORIGIN")
+      endif()
       target_link_libraries(${_NAME}
       PUBLIC ${ABSL_CC_LIB_DEPS}
       PRIVATE
@@ -298,7 +313,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
     if(ABSL_ENABLE_INSTALL)
       set_target_properties(${_NAME} PROPERTIES
         OUTPUT_NAME "absl_${_NAME}"
-        SOVERSION "2401.0.0"
+        SOVERSION "${ABSL_SOVERSION}"
       )
     endif()
   else()

package/vendor/abseil-cpp/CMake/Googletest/CMakeLists.txt.in

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 
 project(googletest-external NONE)
 

package/vendor/abseil-cpp/CMake/README.md

@@ -39,7 +39,7 @@ section of your executable or of your library.<br>
 Here is a short CMakeLists.txt example of an application project using Abseil.
 
 ```cmake
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 project(my_app_project)
 
 # Pick the C++ standard to compile with.
@@ -62,7 +62,7 @@ will control Abseil library targets) is set to at least that minimum. For
 example:
 
 ```cmake
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 project(my_lib_project)
 
 # Leave C++ standard up to the root application, so set it only if this is the

package/vendor/abseil-cpp/CMake/install_test_project/CMakeLists.txt

@@ -15,7 +15,7 @@
 
 # A simple CMakeLists.txt for testing cmake installation
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 project(absl_cmake_testing CXX)
 
 add_executable(simple simple.cc)

package/vendor/abseil-cpp/CMake/install_test_project/test.sh

@@ -22,7 +22,8 @@ set -euox pipefail
 absl_dir=/abseil-cpp
 absl_build_dir=/buildfs
 googletest_builddir=/googletest_builddir
-project_dir="${absl_dir}"/CMake/install_test_project
+googletest_archive="googletest-${ABSL_GOOGLETEST_VERSION}.tar.gz"
+project_dir="${absl_dir}/CMake/install_test_project"
 project_build_dir=/buildfs/project-build
 
 build_shared_libs="OFF"
@@ -33,9 +34,9 @@ fi
 # Build and install GoogleTest
 mkdir "${googletest_builddir}"
 pushd "${googletest_builddir}"
-curl -L "${ABSL_GOOGLETEST_DOWNLOAD_URL}" --output "${ABSL_GOOGLETEST_COMMIT}".zip
-unzip "${ABSL_GOOGLETEST_COMMIT}".zip
-pushd "googletest-${ABSL_GOOGLETEST_COMMIT}"
+curl -L "${ABSL_GOOGLETEST_DOWNLOAD_URL}" --output "${googletest_archive}"
+tar -xz -f "${googletest_archive}"
+pushd "googletest-${ABSL_GOOGLETEST_VERSION}"
 mkdir build
 pushd build
 cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS="${build_shared_libs}" ..