diff --git a/Brewfile b/Brewfile
index 3927dc4b2a15d3a7694fe6ddb75dfd8b692c78db..5ca5f4d29e4bd89e17d77d63e8e3575a77735cbc 100644
--- a/Brewfile
+++ b/Brewfile
@@ -17,7 +17,6 @@ brew "libssh2"
brew "lychee"
brew "openssl@1.1", link: :force
brew "pkg-config"
-brew "re2"
brew "runit"
brew "sqlite"
brew "vault"
diff --git a/Vagrantfile b/Vagrantfile
index 457d7d37176c502218c5ab5dab9f6a3f7baf3f32..fd3e8f370fc5226bc79379cbb97a3eb978cf1f46 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -65,7 +65,7 @@ $apt_reqs = <<COMMANDS # rubocop:disable Style/GlobalVars
apt-get update
apt-get -y install golang-1.14-go
ln -s /usr/lib/go-1.14/bin/* /usr/local/bin
- apt-get -y install git graphicsmagick postgresql postgresql-contrib libpq-dev libimage-exiftool-perl redis-server libicu-dev cmake g++ nodejs libkrb5-dev curl ruby ed nginx libgmp-dev rvm yarn libre2-dev docker.io runit google-chrome-stable
+ apt-get -y install git graphicsmagick postgresql postgresql-contrib libpq-dev libimage-exiftool-perl redis-server libicu-dev cmake g++ nodejs libkrb5-dev curl ruby ed nginx libgmp-dev rvm yarn docker.io runit google-chrome-stable
wget -qO /usr/local/bin/minio https://dl.min.io/server/minio/release/linux-amd64/minio && chmod +x /usr/local/bin/minio
apt-get -y upgrade
COMMANDS
diff --git a/doc/advanced.md b/doc/advanced.md
index 58ae6d519684c42ba4b020d8c399fb4db33c4c69..6b3a61ad6f0aaf516fa8b50d54ddfbbe50dcdc85 100644
--- a/doc/advanced.md
+++ b/doc/advanced.md
@@ -47,12 +47,6 @@ using rbenv, such as:
rbenv install 2.7.5
```
-1. To ensure the `re2` gem is built correctly, explicitly set the directory where brew installed `re2`:
-
- ```shell
- bundle config --local build.re2 --with-re2-dir=$(brew --prefix re2)
- ```
-
## Ubuntu and Debian
The following are instructions for Ubuntu and Debian users that don't want
@@ -220,7 +214,7 @@ To install dependencies for Fedora:
```shell
sudo dnf install postgresql postgresql-libs redis libicu-devel \
git git-lfs ed make cmake rpm-build gcc-c++ krb5-devel go postgresql-server \
- postgresql-contrib postgresql-devel re2 GraphicsMagick re2-devel sqlite-devel \
+ postgresql-contrib postgresql-devel GraphicsMagick sqlite-devel \
perl-Digest-SHA perl-Image-ExifTool rsync libyaml-devel
sudo curl "https://dl.min.io/server/minio/release/linux-amd64/minio" --output /usr/local/bin/minio
sudo chmod +x /usr/local/bin/minio
@@ -264,7 +258,7 @@ sudo dnf module enable postgresql:12
sudo dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
sudo dnf install postgresql-server postgresql-devel libicu-devel git git-lfs cmake \
gcc-c++ go redis ed fontconfig freetype libfreetype.so.6 libfontconfig.so.1 \
- libstdc++.so.6 npm re2 re2-devel GraphicsMagick perl-Image-ExifTool \
+ libstdc++.so.6 npm GraphicsMagick perl-Image-ExifTool \
rsync sqlite-devel make
sudo curl "https://dl.min.io/server/minio/release/linux-amd64/minio" --output /usr/local/bin/minio
sudo chmod +x /usr/local/bin/minio
@@ -293,7 +287,7 @@ sudo dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noa
sudo dnf module install postgresql:12 redis:5 nodejs:14 go-toolset
sudo dnf install postgresql-server postgresql-devel libicu-devel git git-lfs cmake \
gcc-c++ go redis ed fontconfig freetype libfreetype.so.6 libfontconfig.so.1 \
- libstdc++.so.6 npm re2 re2-devel GraphicsMagick perl-Image-ExifTool \
+ libstdc++.so.6 npm GraphicsMagick perl-Image-ExifTool \
rsync sqlite-devel make
sudo curl "https://dl.min.io/server/minio/release/linux-amd64/minio" --output /usr/local/bin/minio
sudo chmod +x /usr/local/bin/minio
@@ -335,7 +329,7 @@ sudo zypper install libxslt-devel postgresql postgresql-devel redis libicu-devel
rpm-build gcc-c++ krb5-devel postgresql-server postgresql-contrib \
libxml2-devel libxml2-devel-32bit findutils-locate GraphicsMagick \
exiftool rsync sqlite3-devel postgresql-server-devel \
- libgpg-error-devel libqgpgme-devel yarn curl wget re2-devel
+ libgpg-error-devel libqgpgme-devel yarn curl wget
sudo curl "https://dl.min.io/server/minio/release/linux-amd64/minio" --output /usr/local/bin/minio
sudo chmod +x /usr/local/bin/minio
```
@@ -423,7 +417,7 @@ To run GDK on Void, you must install `ruby` with development headers, gem binary
```shell
sudo xbps-install -Su
-sudo xbps-install ruby ruby-devel minio re2 re2-devel icu icu-libs icu-devel \
+sudo xbps-install ruby ruby-devel minio icu icu-libs icu-devel \
go redis yarn GraphicsMagick sqlite sqlite-devel pkg-config \
postgresql13 postgresql13-client postgresql13-contrib postgresql-libs postgresql-libs-devel
```
@@ -438,7 +432,7 @@ The following are instructions for Gentoo users who don't want
Install the required packages:
```shell
-sudo emerge --noreplace app-admin/sudo app-arch/unzip app-crypt/gnupg app-crypt/mit-krb5 dev-db/postgresql dev-db/redis dev-db/sqlite dev-lang/go dev-libs/icu dev-libs/libpcre2 dev-libs/libyaml dev-libs/openssl dev-libs/re2 dev-python/docutils dev-util/cmake dev-util/pkgconf dev-util/yamllint dev-vcs/git dev-vcs/git-lfs media-gfx/graphicsmagick media-libs/exiftool net-libs/nodejs net-misc/curl net-misc/wget sys-apps/ed sys-apps/net-tools sys-apps/which sys-apps/yarn sys-apps/util-linux sys-libs/readline sys-libs/zlib sys-process/psmisc sys-process/runit virtual/openssh
+sudo emerge --noreplace app-admin/sudo app-arch/unzip app-crypt/gnupg app-crypt/mit-krb5 dev-db/postgresql dev-db/redis dev-db/sqlite dev-lang/go dev-libs/icu dev-libs/libpcre2 dev-libs/libyaml dev-libs/openssl dev-python/docutils dev-util/cmake dev-util/pkgconf dev-util/yamllint dev-vcs/git dev-vcs/git-lfs media-gfx/graphicsmagick media-libs/exiftool net-libs/nodejs net-misc/curl net-misc/wget sys-apps/ed sys-apps/net-tools sys-apps/which sys-apps/yarn sys-apps/util-linux sys-libs/readline sys-libs/zlib sys-process/psmisc sys-process/runit virtual/openssh
```
Read the result message from emerge, as it will tell you what you must run
diff --git a/packages_arch.txt b/packages_arch.txt
index 98ef1e4ddbf7f0fcfc210660cb3d58a253c4c57c..8666380e808a1ba4885b3535d896d7798e42a8f2 100644
--- a/packages_arch.txt
+++ b/packages_arch.txt
@@ -16,7 +16,6 @@ postgresql
postgresql-libs
python-docutils
python3
-re2
redis
rsync
sqlite
diff --git a/packages_debian.txt b/packages_debian.txt
index 394fbbca4e06a727bab3a9507dd01a4db76c8b8e..87bf3db339f1c575ed0d655c5deaecd42b4351a9 100644
--- a/packages_debian.txt
+++ b/packages_debian.txt
@@ -17,7 +17,6 @@ libimage-exiftool-perl
libkrb5-dev
libpcre2-dev
libpq-dev
-libre2-dev
libreadline-dev
libsqlite3-dev
libssl-dev
diff --git a/packages_fedora.txt b/packages_fedora.txt
index 0ab4b9a253dd8d73cf1f1be855c151931f3c47cf..3a4281b73ec4ec6d180c8c9d5ba65f699d17e897 100644
--- a/packages_fedora.txt
+++ b/packages_fedora.txt
@@ -24,8 +24,6 @@ perl-core
perl-Digest-SHA
perl-Image-ExifTool
python3-docutils
-re2
-re2-devel
readline-devel
redis
rpm-build
diff --git a/packages_ubuntu.txt b/packages_ubuntu.txt
index 16c42a1c528856d8b57b42b893dc1c019e598977..19dc904fee13532faead946620397172e719940e 100644
--- a/packages_ubuntu.txt
+++ b/packages_ubuntu.txt
@@ -17,7 +17,6 @@ libimage-exiftool-perl
libkrb5-dev
libpcre2-dev
libpq-dev
-libre2-dev
libreadline-dev
libsqlite3-dev
libssl-dev
diff --git a/support/bootstrap-common.sh b/support/bootstrap-common.sh
index 7fe396b637c0b74284ec5871c328f3e0241383f4..13cea4d1f4cbde85cdead27cc5305bc667d03a3d 100644
--- a/support/bootstrap-common.sh
+++ b/support/bootstrap-common.sh
@@ -295,8 +295,7 @@ configure_ruby_bundler_for_gitlab() {
bundle config unset build.gpgme
if [[ "${OSTYPE}" == "darwin"* ]]; then
- # shellcheck disable=SC2046
- bundle config build.re2 --with-re2-dir="$(brew --prefix re2)" --with-cppflags=\'-I$(brew --prefix abseil)/include -x c++ -std=c++20\'
+ bundle config unset build.re2
clang_version=$(clang --version | head -n1 | awk '{ print $4 }' | awk -F'.' '{ print $1 }')