re2 2.0.0.beta1-arm64-darwin → 2.1.0-arm64-darwin

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 585b0871785ac1e64f61a5e9cb8c64e4085255304cc4c3b1790b2af3e7a0e6cc
4
- data.tar.gz: 5bc778930994d2390d3f399504ad2e93d7dbafaa1a5584aa0963582cedf1e717
3
+ metadata.gz: b057196bb1626c2eaef1d50ab37a146306bb24a61a31a7b6bdfd8623242af8a9
4
+ data.tar.gz: 432f0fdb9984f9f45fad95e13a3f56998a5cfdd599f70b0cea0f9469dccf07fb
5
5
  SHA512:
6
- metadata.gz: 6deee856114bc3e4be0d2c4a3228524618d3f272d847c3e39eec9f28b986dc8d24e1e2d311ab4f7ae1c2101322459a92efd85cba4649f30ba604a9f725a73bef
7
- data.tar.gz: 14b7160bed5cd9ab46c1ab97b236399665194585cf4a033d6016532ef196af1b7f117d6eb0d9a20c9bc7b89d9a530f6cdb2aa925017399a9ed74855ede846087
6
+ metadata.gz: 76e80cc5cc96bff61e0933eeb9b7d1014edafe539320b5aae6b88230aa316fc81e0285b40ad102740e3bf4174e726255028ee9c18ef820e5f378f4c189a91b37
7
+ data.tar.gz: 9be6f2a952154f0083739f11b8d2518dd3eb5a594c31d187e55dc1016d717b09dccf64a1c140cd164698549f4cc3ac9b7c21144b773df7a5b2d0339ead4be5e7
data/Gemfile CHANGED
@@ -2,12 +2,4 @@ source "https://rubygems.org"
2
2
 
3
3
  gemspec
4
4
 
5
- rake_constraint = if RUBY_VERSION < "1.9.3"
6
- "< 11.0.0"
7
- elsif RUBY_VERSION < "2.0.0"
8
- "< 12.0.0"
9
- else
10
- "> 12.3.2"
11
- end
12
-
13
- gem "rake", rake_constraint
5
+ gem "rake", "> 12.3.2"
@@ -0,0 +1,237 @@
1
+ # Vendored Dependency Licenses
2
+
3
+ The library re2 (which lives at https://github.com/mudge/re2) may include the source code for RE2 (which lives at https://github.com/google/re2) and Abseil (which lives at https://abseil.io).
4
+
5
+ The license terms shipped with RE2 are included here for your convenience:
6
+
7
+ // Copyright (c) 2009 The RE2 Authors. All rights reserved.
8
+ //
9
+ // Redistribution and use in source and binary forms, with or without
10
+ // modification, are permitted provided that the following conditions are
11
+ // met:
12
+ //
13
+ // * Redistributions of source code must retain the above copyright
14
+ // notice, this list of conditions and the following disclaimer.
15
+ // * Redistributions in binary form must reproduce the above
16
+ // copyright notice, this list of conditions and the following disclaimer
17
+ // in the documentation and/or other materials provided with the
18
+ // distribution.
19
+ // * Neither the name of Google Inc. nor the names of its
20
+ // contributors may be used to endorse or promote products derived from
21
+ // this software without specific prior written permission.
22
+ //
23
+ // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
24
+ // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
25
+ // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
26
+ // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
27
+ // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
28
+ // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
29
+ // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30
+ // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31
+ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32
+ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
33
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34
+
35
+ The license terms shipped with Abseil are included here for your convenience:
36
+
37
+ Apache License
38
+ Version 2.0, January 2004
39
+ https://www.apache.org/licenses/
40
+
41
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
42
+
43
+ 1. Definitions.
44
+
45
+ "License" shall mean the terms and conditions for use, reproduction,
46
+ and distribution as defined by Sections 1 through 9 of this document.
47
+
48
+ "Licensor" shall mean the copyright owner or entity authorized by
49
+ the copyright owner that is granting the License.
50
+
51
+ "Legal Entity" shall mean the union of the acting entity and all
52
+ other entities that control, are controlled by, or are under common
53
+ control with that entity. For the purposes of this definition,
54
+ "control" means (i) the power, direct or indirect, to cause the
55
+ direction or management of such entity, whether by contract or
56
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
57
+ outstanding shares, or (iii) beneficial ownership of such entity.
58
+
59
+ "You" (or "Your") shall mean an individual or Legal Entity
60
+ exercising permissions granted by this License.
61
+
62
+ "Source" form shall mean the preferred form for making modifications,
63
+ including but not limited to software source code, documentation
64
+ source, and configuration files.
65
+
66
+ "Object" form shall mean any form resulting from mechanical
67
+ transformation or translation of a Source form, including but
68
+ not limited to compiled object code, generated documentation,
69
+ and conversions to other media types.
70
+
71
+ "Work" shall mean the work of authorship, whether in Source or
72
+ Object form, made available under the License, as indicated by a
73
+ copyright notice that is included in or attached to the work
74
+ (an example is provided in the Appendix below).
75
+
76
+ "Derivative Works" shall mean any work, whether in Source or Object
77
+ form, that is based on (or derived from) the Work and for which the
78
+ editorial revisions, annotations, elaborations, or other modifications
79
+ represent, as a whole, an original work of authorship. For the purposes
80
+ of this License, Derivative Works shall not include works that remain
81
+ separable from, or merely link (or bind by name) to the interfaces of,
82
+ the Work and Derivative Works thereof.
83
+
84
+ "Contribution" shall mean any work of authorship, including
85
+ the original version of the Work and any modifications or additions
86
+ to that Work or Derivative Works thereof, that is intentionally
87
+ submitted to Licensor for inclusion in the Work by the copyright owner
88
+ or by an individual or Legal Entity authorized to submit on behalf of
89
+ the copyright owner. For the purposes of this definition, "submitted"
90
+ means any form of electronic, verbal, or written communication sent
91
+ to the Licensor or its representatives, including but not limited to
92
+ communication on electronic mailing lists, source code control systems,
93
+ and issue tracking systems that are managed by, or on behalf of, the
94
+ Licensor for the purpose of discussing and improving the Work, but
95
+ excluding communication that is conspicuously marked or otherwise
96
+ designated in writing by the copyright owner as "Not a Contribution."
97
+
98
+ "Contributor" shall mean Licensor and any individual or Legal Entity
99
+ on behalf of whom a Contribution has been received by Licensor and
100
+ subsequently incorporated within the Work.
101
+
102
+ 2. Grant of Copyright License. Subject to the terms and conditions of
103
+ this License, each Contributor hereby grants to You a perpetual,
104
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
105
+ copyright license to reproduce, prepare Derivative Works of,
106
+ publicly display, publicly perform, sublicense, and distribute the
107
+ Work and such Derivative Works in Source or Object form.
108
+
109
+ 3. Grant of Patent License. Subject to the terms and conditions of
110
+ this License, each Contributor hereby grants to You a perpetual,
111
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
112
+ (except as stated in this section) patent license to make, have made,
113
+ use, offer to sell, sell, import, and otherwise transfer the Work,
114
+ where such license applies only to those patent claims licensable
115
+ by such Contributor that are necessarily infringed by their
116
+ Contribution(s) alone or by combination of their Contribution(s)
117
+ with the Work to which such Contribution(s) was submitted. If You
118
+ institute patent litigation against any entity (including a
119
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
120
+ or a Contribution incorporated within the Work constitutes direct
121
+ or contributory patent infringement, then any patent licenses
122
+ granted to You under this License for that Work shall terminate
123
+ as of the date such litigation is filed.
124
+
125
+ 4. Redistribution. You may reproduce and distribute copies of the
126
+ Work or Derivative Works thereof in any medium, with or without
127
+ modifications, and in Source or Object form, provided that You
128
+ meet the following conditions:
129
+
130
+ (a) You must give any other recipients of the Work or
131
+ Derivative Works a copy of this License; and
132
+
133
+ (b) You must cause any modified files to carry prominent notices
134
+ stating that You changed the files; and
135
+
136
+ (c) You must retain, in the Source form of any Derivative Works
137
+ that You distribute, all copyright, patent, trademark, and
138
+ attribution notices from the Source form of the Work,
139
+ excluding those notices that do not pertain to any part of
140
+ the Derivative Works; and
141
+
142
+ (d) If the Work includes a "NOTICE" text file as part of its
143
+ distribution, then any Derivative Works that You distribute must
144
+ include a readable copy of the attribution notices contained
145
+ within such NOTICE file, excluding those notices that do not
146
+ pertain to any part of the Derivative Works, in at least one
147
+ of the following places: within a NOTICE text file distributed
148
+ as part of the Derivative Works; within the Source form or
149
+ documentation, if provided along with the Derivative Works; or,
150
+ within a display generated by the Derivative Works, if and
151
+ wherever such third-party notices normally appear. The contents
152
+ of the NOTICE file are for informational purposes only and
153
+ do not modify the License. You may add Your own attribution
154
+ notices within Derivative Works that You distribute, alongside
155
+ or as an addendum to the NOTICE text from the Work, provided
156
+ that such additional attribution notices cannot be construed
157
+ as modifying the License.
158
+
159
+ You may add Your own copyright statement to Your modifications and
160
+ may provide additional or different license terms and conditions
161
+ for use, reproduction, or distribution of Your modifications, or
162
+ for any such Derivative Works as a whole, provided Your use,
163
+ reproduction, and distribution of the Work otherwise complies with
164
+ the conditions stated in this License.
165
+
166
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
167
+ any Contribution intentionally submitted for inclusion in the Work
168
+ by You to the Licensor shall be under the terms and conditions of
169
+ this License, without any additional terms or conditions.
170
+ Notwithstanding the above, nothing herein shall supersede or modify
171
+ the terms of any separate license agreement you may have executed
172
+ with Licensor regarding such Contributions.
173
+
174
+ 6. Trademarks. This License does not grant permission to use the trade
175
+ names, trademarks, service marks, or product names of the Licensor,
176
+ except as required for reasonable and customary use in describing the
177
+ origin of the Work and reproducing the content of the NOTICE file.
178
+
179
+ 7. Disclaimer of Warranty. Unless required by applicable law or
180
+ agreed to in writing, Licensor provides the Work (and each
181
+ Contributor provides its Contributions) on an "AS IS" BASIS,
182
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
183
+ implied, including, without limitation, any warranties or conditions
184
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
185
+ PARTICULAR PURPOSE. You are solely responsible for determining the
186
+ appropriateness of using or redistributing the Work and assume any
187
+ risks associated with Your exercise of permissions under this License.
188
+
189
+ 8. Limitation of Liability. In no event and under no legal theory,
190
+ whether in tort (including negligence), contract, or otherwise,
191
+ unless required by applicable law (such as deliberate and grossly
192
+ negligent acts) or agreed to in writing, shall any Contributor be
193
+ liable to You for damages, including any direct, indirect, special,
194
+ incidental, or consequential damages of any character arising as a
195
+ result of this License or out of the use or inability to use the
196
+ Work (including but not limited to damages for loss of goodwill,
197
+ work stoppage, computer failure or malfunction, or any and all
198
+ other commercial damages or losses), even if such Contributor
199
+ has been advised of the possibility of such damages.
200
+
201
+ 9. Accepting Warranty or Additional Liability. While redistributing
202
+ the Work or Derivative Works thereof, You may choose to offer,
203
+ and charge a fee for, acceptance of support, warranty, indemnity,
204
+ or other liability obligations and/or rights consistent with this
205
+ License. However, in accepting such obligations, You may act only
206
+ on Your own behalf and on Your sole responsibility, not on behalf
207
+ of any other Contributor, and only if You agree to indemnify,
208
+ defend, and hold each Contributor harmless for any liability
209
+ incurred by, or claims asserted against, such Contributor by reason
210
+ of your accepting any such warranty or additional liability.
211
+
212
+ END OF TERMS AND CONDITIONS
213
+
214
+ APPENDIX: How to apply the Apache License to your work.
215
+
216
+ To apply the Apache License to your work, attach the following
217
+ boilerplate notice, with the fields enclosed by brackets "[]"
218
+ replaced with your own identifying information. (Don't include
219
+ the brackets!) The text should be enclosed in the appropriate
220
+ comment syntax for the file format. We also recommend that a
221
+ file or class name and description of purpose be included on the
222
+ same "printed page" as the copyright notice for easier
223
+ identification within third-party archives.
224
+
225
+ Copyright [yyyy] [name of copyright owner]
226
+
227
+ Licensed under the Apache License, Version 2.0 (the "License");
228
+ you may not use this file except in compliance with the License.
229
+ You may obtain a copy of the License at
230
+
231
+ https://www.apache.org/licenses/LICENSE-2.0
232
+
233
+ Unless required by applicable law or agreed to in writing, software
234
+ distributed under the License is distributed on an "AS IS" BASIS,
235
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
236
+ See the License for the specific language governing permissions and
237
+ limitations under the License.
data/LICENSE.txt CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2010-2014, Paul Mucur.
1
+ Copyright (c) 2010, Paul Mucur.
2
2
  All rights reserved.
3
3
 
4
4
  Redistribution and use in source and binary forms, with or without
data/README.md CHANGED
@@ -1,20 +1,37 @@
1
1
  re2 [![Build Status](https://github.com/mudge/re2/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/mudge/re2/actions)
2
2
  ===
3
3
 
4
- A Ruby binding to [re2][], an "efficient, principled regular expression
5
- library".
4
+ Ruby bindings to [RE2][], a "fast, safe, thread-friendly alternative to
5
+ backtracking regular expression engines like those used in PCRE, Perl, and
6
+ Python".
6
7
 
7
- **Current version:** 1.7.0
8
- **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
9
- **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)
8
+ **Current version:** 2.1.0
9
+ **Supported Ruby versions:** 2.6, 2.7, 3.0, 3.1, 3.2
10
+ **Bundled RE2 version:** libre2.11 (2023-09-01)
11
+ **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)
10
12
 
11
13
  Installation
12
14
  ------------
13
15
 
14
- You will need [re2][] installed as well as a C++ compiler such as [gcc][] (on
15
- Debian and Ubuntu, this is provided by the [build-essential][] package). If
16
- you are using Mac OS X, I recommend installing re2 with [Homebrew][] by
17
- running the following:
16
+ The gem comes bundled with a version of [RE2][] and will compile itself (and
17
+ any dependencies) on install. As compilation can take a while, precompiled
18
+ native gems are available for Linux, Windows and macOS.
19
+
20
+ In v2.0 and later, precompiled native gems are available for Ruby 2.6 to 3.2
21
+ on these platforms:
22
+
23
+ - `aarch64-linux` (requires: glibc >= 2.29)
24
+ - `arm-linux` (requires: glibc >= 2.29)
25
+ - `arm64-darwin`
26
+ - `x64-mingw32` / `x64-mingw-ucrt`
27
+ - `x86-linux` (requires: glibc >= 2.17)
28
+ - `x86_64-darwin`
29
+ - `x86_64-linux` (requires: glibc >= 2.17)
30
+
31
+ If you wish to opt out of using the bundled libraries, you will need RE2
32
+ installed as well as a C++ compiler such as [gcc][] (on Debian and Ubuntu, this
33
+ is provided by the [build-essential][] package). If you are using macOS, I
34
+ recommend installing RE2 with [Homebrew][] by running the following:
18
35
 
19
36
  $ brew install re2
20
37
 
@@ -22,27 +39,35 @@ If you are using Debian, you can install the [libre2-dev][] package like so:
22
39
 
23
40
  $ sudo apt-get install libre2-dev
24
41
 
25
- 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.
42
+ Recent versions of RE2 require a compiler with C++14 support such as
43
+ [clang](http://clang.llvm.org/) 3.4 or [gcc](https://gcc.gnu.org/) 5.
26
44
 
27
45
  If you are using a packaged Ruby distribution, make sure you also have the
28
46
  Ruby header files installed such as those provided by the [ruby-dev][] package
29
47
  on Debian and Ubuntu.
30
48
 
31
- You can then install the library via RubyGems with `gem install re2` or `gem
32
- install re2 -- --with-re2-dir=/path/to/re2/prefix` if re2 is not installed in
33
- any of the following default locations:
49
+ You can then install the library via RubyGems with `gem install re2 --platform=ruby --
50
+ --enable-system-libraries` or `gem install re2 --platform=ruby -- --enable-system-libraries
51
+ --with-re2-dir=/path/to/re2/prefix` if RE2 is not installed in any of the
52
+ following default locations:
34
53
 
35
54
  * `/usr/local`
36
55
  * `/opt/homebrew`
37
56
  * `/usr`
38
57
 
58
+ Alternatively, you can set the `RE2_USE_SYSTEM_LIBRARIES` environment variable instead of passing `--enable-system-libraries` to the `gem` command.
59
+
60
+ If you're using Bundler, you can use the
61
+ [`force_ruby_platform`](https://bundler.io/v2.3/man/gemfile.5.html#FORCE_RUBY_PLATFORM)
62
+ option in your Gemfile.
63
+
39
64
  Documentation
40
65
  -------------
41
66
 
42
67
  Full documentation automatically generated from the latest version is
43
68
  available at <http://mudge.name/re2/>.
44
69
 
45
- Note that re2's regular expression syntax differs from PCRE and Ruby's
70
+ Note that RE2's regular expression syntax differs from PCRE and Ruby's
46
71
  built-in [`Regexp`][Regexp] library, see the [official syntax page][] for more
47
72
  details.
48
73
 
@@ -168,6 +193,24 @@ end
168
193
  # My name is Alice and I am 42 years old
169
194
  ```
170
195
 
196
+ Encoding
197
+ --------
198
+
199
+ Note RE2 only supports UTF-8 and ISO-8859-1 encoding so strings will be
200
+ returned in UTF-8 by default or ISO-8859-1 if the `:utf8` option for the
201
+ `RE2::Regexp` is set to false (any other encoding's behaviour is undefined).
202
+
203
+ For backward compatibility: re2 won't automatically convert string inputs to
204
+ the right encoding so this is the responsibility of the caller, e.g.
205
+
206
+ ```ruby
207
+ # By default, RE2 will process patterns and text as UTF-8
208
+ RE2(non_utf8_pattern.encode("UTF-8")).match(non_utf8_text.encode("UTF-8"))
209
+
210
+ # If the :utf8 option is false, RE2 will process patterns and text as ISO-8859-1
211
+ RE2(non_latin1_pattern.encode("ISO-8859-1"), :utf8 => false).match(non_latin1_text.encode("ISO-8859-1"))
212
+ ```
213
+
171
214
  Features
172
215
  --------
173
216
 
@@ -214,9 +257,9 @@ Contributions
214
257
  * Thanks to [Jason Woods](https://github.com/driskell) who contributed the
215
258
  original implementations of `RE2::MatchData#begin` and `RE2::MatchData#end`;
216
259
  * Thanks to [Stefano Rivera](https://github.com/stefanor) who first contributed C++11 support;
217
- * 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);
260
+ * 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;
218
261
  * Thanks to [Sebastian Reitenbach](https://github.com/buzzdeee) for reporting
219
- the deprecation and removal of the `utf8` encoding option in re2;
262
+ the deprecation and removal of the `utf8` encoding option in RE2;
220
263
  * Thanks to [Sergio Medina](https://github.com/serch) for reporting a bug when
221
264
  using `RE2::Scanner#scan` with an invalid regular expression;
222
265
  * Thanks to [Pritam Baral](https://github.com/pritambaral) for contributed the
@@ -227,7 +270,19 @@ Contact
227
270
 
228
271
  All issues and suggestions should go to [GitHub Issues](https://github.com/mudge/re2/issues).
229
272
 
230
- [re2]: https://github.com/google/re2
273
+ License
274
+ -------
275
+
276
+ This library is licensed under the BSD 3-Clause License, see `LICENSE.txt`.
277
+
278
+ Dependencies
279
+ ------------
280
+
281
+ The source code of [RE2][] is distributed in the `ruby` platform gem. This code is licensed under the BSD 3-Clause License, see `LICENSE-DEPENDENCIES.txt`.
282
+
283
+ The source code of [Abseil][] is distributed in the `ruby` platform gem. This code is licensed under the Apache License 2.0, see `LICENSE-DEPENDENCIES.txt`.
284
+
285
+ [RE2]: https://github.com/google/re2
231
286
  [gcc]: http://gcc.gnu.org/
232
287
  [ruby-dev]: http://packages.debian.org/ruby-dev
233
288
  [build-essential]: http://packages.debian.org/build-essential
@@ -236,4 +291,4 @@ All issues and suggestions should go to [GitHub Issues](https://github.com/mudge
236
291
  [Homebrew]: http://mxcl.github.com/homebrew
237
292
  [libre2-dev]: http://packages.debian.org/search?keywords=libre2-dev
238
293
  [official syntax page]: https://github.com/google/re2/wiki/Syntax
239
-
294
+ [Abseil]: https://abseil.io
data/Rakefile CHANGED
@@ -33,7 +33,7 @@ Gem::PackageTask.new(RE2_GEM_SPEC) do |p|
33
33
  p.need_tar = false
34
34
  end
35
35
 
36
- CROSS_RUBY_VERSIONS = %w[3.2.0 3.1.0 3.0.0 2.7.0].join(':')
36
+ CROSS_RUBY_VERSIONS = %w[3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(':')
37
37
  CROSS_RUBY_PLATFORMS = %w[
38
38
  aarch64-linux
39
39
  arm-linux
@@ -129,27 +129,4 @@ task gem_build_path do
129
129
  add_vendored_libraries
130
130
  end
131
131
 
132
- desc "Temporarily set VERSION to a unique timestamp"
133
- task "set-version-to-timestamp" do
134
- # this task is used by bin/test-gem-build
135
- # to test building, packaging, and installing a precompiled gem
136
- version_constant_re = /^\s*VERSION\s*=\s*["'](.*)["']$/
137
-
138
- version_file_path = File.join(__dir__, "lib/re2/version.rb")
139
- version_file_contents = File.read(version_file_path)
140
-
141
- current_version_string = version_constant_re.match(version_file_contents)[1]
142
- current_version = Gem::Version.new(current_version_string)
143
-
144
- fake_version = Gem::Version.new(format("%s.test.%s", current_version.bump, Time.now.strftime("%Y.%m%d.%H%M")))
145
-
146
- unless version_file_contents.gsub!(version_constant_re, " VERSION = \"#{fake_version}\"")
147
- raise("Could not hack the VERSION constant")
148
- end
149
-
150
- File.open(version_file_path, "w") { |f| f.write(version_file_contents) }
151
-
152
- puts "NOTE: wrote version as \"#{fake_version}\""
153
- end
154
-
155
132
  task default: [:compile, :spec]
data/dependencies.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  libre2:
2
- version: "2023-07-01"
3
- sha256: "18cf85922e27fad3ed9c96a27733037da445f35eb1a2744c306a37c6d11e95c4"
4
- # sha-256 hash provided in https://github.com/google/re2/releases/download/2023-07-01/re2-2023-07-01.tar.gz
2
+ version: "2023-09-01"
3
+ sha256: "5bb6875ae1cd1e9fedde98018c346db7260655f86fdb8837e3075103acd3649b"
4
+ # sha-256 hash provided in https://github.com/google/re2/releases/download/2023-09-01/re2-2023-09-01.tar.gz
5
5
 
6
6
  abseil:
7
7
  version: "20230125.3"
data/ext/re2/extconf.rb CHANGED
@@ -117,8 +117,10 @@ if ENV["CXX"]
117
117
  RbConfig::CONFIG["CXX"] = ENV["CXX"]
118
118
  end
119
119
 
120
- def build_extension
120
+ def build_extension(static_p = false)
121
+ # Enable optional warnings but disable deprecated register warning for Ruby 2.6 support
121
122
  $CFLAGS << " -Wall -Wextra -funroll-loops"
123
+ $CPPFLAGS << " -Wno-register"
122
124
 
123
125
  # Pass -x c++ to force gcc to compile the test program
124
126
  # as C++ (as it will end in .c by default).
@@ -128,7 +130,7 @@ def build_extension
128
130
  have_header("stdint.h")
129
131
  have_func("rb_str_sublen")
130
132
 
131
- unless have_library("re2")
133
+ if !static_p and !have_library("re2")
132
134
  abort "You must have re2 installed and specified with --with-re2-dir, please see https://github.com/google/re2/wiki/Install"
133
135
  end
134
136
 
@@ -326,14 +328,65 @@ ABSL_LDFLAGS = %w[
326
328
  -labsl_time_zone
327
329
  ].freeze
328
330
 
329
- def add_static_ldflags(flags)
330
- static_flags = flags.split
331
+ def libflag_to_filename(ldflag)
332
+ case ldflag
333
+ when /\A-l(.+)/
334
+ "lib#{Regexp.last_match(1)}.#{$LIBEXT}"
335
+ end
336
+ end
337
+
338
+ # This method does a number of things to ensure the final shared library
339
+ # is compiled statically with the vendored libraries:
340
+ #
341
+ # 1. For -L<path> flags, ensure that any `ports` paths are prioritized just
342
+ # in case there are installed libraries that might take precedence.
343
+ # 2. For -l<lib> flags, convert the library to the static library with a
344
+ # full path and substitute the absolute static library. For example,
345
+ # -lre2 maps to /path/to/ports/<arch>/libre2/<version>/lib/libre2.a.
346
+ #
347
+ # This is needed because when building the extension, Ruby appears to
348
+ # insert `-L#{RbConfig::CONFIG['exec_prefix']}/lib` first. If libre2 is
349
+ # in installed in that location then the extension will link against the
350
+ # system library instead of the vendored library.
351
+ def add_flag(arg, lib_paths)
352
+ case arg
353
+ when /\A-L(.+)\z/
354
+ # Prioritize ports' directories
355
+ lib_dir = Regexp.last_match(1)
356
+ $LIBPATH =
357
+ if lib_dir.start_with?(PACKAGE_ROOT_DIR + "/")
358
+ [lib_dir] | $LIBPATH
359
+ else
360
+ $LIBPATH | [lib_dir]
361
+ end
362
+ when /\A-l./
363
+ filename = libflag_to_filename(arg)
364
+
365
+ added = false
366
+ lib_paths.each do |path|
367
+ static_lib = File.join(path, filename)
368
+
369
+ next unless File.exist?(static_lib)
370
+
371
+ $LDFLAGS << " " << static_lib
372
+ added = true
373
+ break
374
+ end
375
+
376
+ append_ldflags(arg.shellescape) unless added
377
+ else
378
+ append_ldflags(arg.shellescape)
379
+ end
380
+ end
381
+
382
+ def add_static_ldflags(flags, lib_paths)
383
+ static_flags = flags.strip.shellsplit
331
384
 
332
385
  if MiniPortile.windows?
333
- static_flags.each { |flag| append_ldflags(flag) unless ABSL_LDFLAGS.include?(flag) }
334
- ABSL_LDFLAGS.each { |flag| append_ldflags(flag) }
386
+ static_flags.each { |flag| add_flag(flag, lib_paths) unless ABSL_LDFLAGS.include?(flag) }
387
+ ABSL_LDFLAGS.each { |flag| add_flag(flag, lib_paths) }
335
388
  else
336
- static_flags.each { |flag| append_ldflags(flag) }
389
+ static_flags.each { |flag| add_flag(flag, lib_paths) }
337
390
  end
338
391
  end
339
392
 
@@ -371,8 +424,9 @@ def build_with_vendored_libraries
371
424
 
372
425
  raise 'Unable to run pkg-config --libs --static' unless $?.success?
373
426
 
374
- add_static_ldflags(flags)
375
- build_extension
427
+ lib_paths = [File.join(abseil_recipe.path, 'lib'), File.join(re2_recipe.path, 'lib')]
428
+ add_static_ldflags(flags, lib_paths)
429
+ build_extension(true)
376
430
  end
377
431
 
378
432
  if config_system_libraries?