Skip to content
Snippets Groups Projects
Commit 7fb2c25a authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch '6359-build-pcre2-from-git-repo' into 'master'

Build pcre2 from git repository

Closes #6359

See merge request gitlab-org/omnibus-gitlab!5565
parents a34ad320 8f9a9b2f
No related branches found
No related tags found
2 merge requests!55Intermediate build after shift of stable series,!54GitLab 14.4
......@@ -142,3 +142,6 @@
psycopg2:
remote: "git@dev.gitlab.org:omnibus-mirror/psycopg2.git"
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/psycopg2.git"
pcre2:
remote: "git@dev.gitlab.org:omnibus-mirror/pcre2.git"
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/pcre2.git"
......@@ -15,7 +15,10 @@
#
name 'pcre2'
default_version '10.34'
version = Gitlab::Version.new('pcre2', 'pcre2-10.34')
default_version version.print(false)
display_version version.print(false).delete_prefix('pcre2-')
license 'BSD-2-Clause'
license_file 'LICENCE'
......@@ -25,4 +28,5 @@
dependency 'libedit'
dependency 'ncurses'
dependency 'config_guess'
dependency 'libtool'
......@@ -28,11 +32,5 @@
version '10.34' do
source md5: 'e3e15cca49557a9c07a21dde2da05ea5'
end
source url: "http://downloads.sourceforge.net/project/pcre/pcre2/#{version}/pcre2-#{version}.tar.gz"
relative_path "pcre2-#{version}"
source git: version.remote
build do
env = with_standard_compiler_flags(with_embedded_path)
......@@ -36,4 +34,5 @@
build do
env = with_standard_compiler_flags(with_embedded_path)
update_config_guess
......@@ -39,5 +38,5 @@
update_config_guess
command "./autogen.sh", env: env
command './configure' \
" --prefix=#{install_dir}/embedded" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment