Skip to content

Commit 607ec5f

Browse files
committed
Remove libre2 from build
With the update to re2 gem v2.0 in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131273, we no longer need to build and ship libre2. The gem handles the building and compiling of all dependencies (libre2 and abseil-cpp), and it also ships with precompiled gems. This unblocks upgrades to the `grpc` gem since grpc/grpc#33615 no longer applies. Changelog: changed
1 parent 6881a23 commit 607ec5f

File tree

6 files changed

+0
-107
lines changed

6 files changed

+0
-107
lines changed

.custom_sources.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ libicu:
103103
krb5:
104104
remote: "[email protected]:omnibus-mirror/krb5.git"
105105
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/krb5.git"
106-
libre2:
107-
remote: "[email protected]:omnibus-mirror/libre2.git"
108-
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/libre2.git"
109106
libpng:
110107
remote: "[email protected]:omnibus-mirror/libpng.git"
111108
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/libpng.git"

config/software/gitlab-rails.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
dependency 'krb5'
5454
dependency 'registry'
5555
dependency 'unzip'
56-
dependency 'libre2'
5756
dependency 'gpgme'
5857
dependency 'graphicsmagick'
5958
dependency 'exiftool'
@@ -114,12 +113,6 @@
114113
bundle "config set --local gemfile #{gitlab_bundle_gemfile}" if gitlab_bundle_gemfile != 'Gemfile'
115114
bundle 'config force_ruby_platform true', env: env if OhaiHelper.ruby_native_gems_unsupported?
116115

117-
# This works around an issue with the grpc gem attempting to include
118-
# /opt/gitlab/include headers instead of the vendored re2 headers:
119-
# https://github.com/grpc/grpc/pull/32580. This can be removed
120-
# after grpc is updated with that pull request.
121-
env['CPPFLAGS'] = "-Ithird_party/re2 #{env['CPPFLAGS']}" if OhaiHelper.arm?
122-
123116
bundle 'config build.gpgme --use-system-libraries', env: env
124117
bundle "config build.nokogiri --use-system-libraries --with-xml2-include=#{install_dir}/embedded/include/libxml2 --with-xslt-include=#{install_dir}/embedded/include/libxslt", env: env
125118
bundle 'config build.grpc --with-ldflags=-Wl,--no-as-needed --with-dldflags=-latomic', env: env if OhaiHelper.raspberry_pi?

config/software/libre2.rb

Lines changed: 0 additions & 48 deletions
This file was deleted.

config/software/ruby-grpc.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@
5454
shellout!("#{gem_bin} install --no-document gem-patch -v 0.1.6")
5555
shellout!("#{gem_bin} uninstall --force --all grpc")
5656

57-
# This works around an issue with the grpc gem attempting to include
58-
# /opt/gitlab/include headers instead of the vendored re2 headers:
59-
# https://github.com/grpc/grpc/pull/32580. This can be removed
60-
# after grpc is updated with that pull request.
61-
env['CPPFLAGS'] = "-Ithird_party/re2 #{env['CPPFLAGS']}"
62-
6357
grpc_versions.each do |version|
6458
patch_path = patches[version]
6559
gemfile = "grpc-#{version}.gem"

test-plans/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44

55
<!-- Keep this list sorted alphabetically. -->
66
- [golang](upgrade-golang-testplan.md)
7-
- [libre2](upgrade-libre2-testplan.md)
87
- [Mattermost](upgrade-mattermost-testplan.md)
98
- [redis](upgrade-redis-testplan.md)

test-plans/upgrade-libre2-testplan.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)