luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-28 21:22:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci: Add libpcre2 dependencies and subproject

Browse Source 
This is in preparation for porting `GRegex` to libpcre2, which is
happening in !2529. It’s a big port, though, and specially rebuilding
the CI images to add libpcre2 for it is a pain.

Add libpcre2, and then !2529 can drop the old libpcre dependencies when
the port lands.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Helps: #1085
This commit is contained in:
Philip Withnall 2022-06-24 12:50:26 +01:00
parent 5e00b30a29
commit 03ea524188
7 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -10,10 +10,10 @@ cache:
- _ccache/ - _ccache/
variables: variables:
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v16" FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v17"
COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v5" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v6"
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v11" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v12"
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v7" MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v8"
MESON_TEST_TIMEOUT_MULTIPLIER: 2 MESON_TEST_TIMEOUT_MULTIPLIER: 2
G_MESSAGES_DEBUG: all G_MESSAGES_DEBUG: all
MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings" MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"

2
.gitlab-ci/coverity.Dockerfile
View File

@ -1,4 +1,4 @@
FROM registry.gitlab.gnome.org/gnome/glib/fedora:v16 FROM registry.gitlab.gnome.org/gnome/glib/fedora:v17
ARG COVERITY_SCAN_PROJECT_NAME ARG COVERITY_SCAN_PROJECT_NAME
ARG COVERITY_SCAN_TOKEN ARG COVERITY_SCAN_TOKEN

1
.gitlab-ci/debian-stable.Dockerfile
View File

@ -27,6 +27,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
libffi-dev \ libffi-dev \
libmount-dev \ libmount-dev \
libpcre3-dev \ libpcre3-dev \
libpcre2-dev \
libselinux1-dev \ libselinux1-dev \
libxml2-utils \ libxml2-utils \
libxslt1-dev \ libxslt1-dev \

1
.gitlab-ci/fedora.Dockerfile
View File

@ -44,6 +44,7 @@ RUN dnf -y update \
ncurses-compat-libs \ ncurses-compat-libs \
ninja-build \ ninja-build \
pcre-devel \ pcre-devel \
pcre2-devel \
"python3-dbusmock >= 0.18.3-2" \ "python3-dbusmock >= 0.18.3-2" \
python3-pip \ python3-pip \
python3-pygments \ python3-pygments \

1
.gitlab-ci/mingw.Dockerfile
View File

@ -44,6 +44,7 @@ RUN dnf -y install \
ncurses-compat-libs \ ncurses-compat-libs \
ninja-build \ ninja-build \
pcre-devel \ pcre-devel \
pcre2-devel \
python3 \ python3 \
python3-pip \ python3-pip \
python3-wheel \ python3-wheel \

1
.gitlab-ci/test-msys2.sh
View File

@ -19,6 +19,7 @@ pacman --noconfirm -S --needed \
mingw-w64-$MSYS2_ARCH-libffi \ mingw-w64-$MSYS2_ARCH-libffi \
mingw-w64-$MSYS2_ARCH-meson \ mingw-w64-$MSYS2_ARCH-meson \
mingw-w64-$MSYS2_ARCH-pcre \ mingw-w64-$MSYS2_ARCH-pcre \
mingw-w64-$MSYS2_ARCH-pcre2 \
mingw-w64-$MSYS2_ARCH-python3 \ mingw-w64-$MSYS2_ARCH-python3 \
mingw-w64-$MSYS2_ARCH-python-pip \ mingw-w64-$MSYS2_ARCH-python-pip \
mingw-w64-$MSYS2_ARCH-toolchain \ mingw-w64-$MSYS2_ARCH-toolchain \

16
subprojects/pcre2.wrap Normal file
View File

@ -0,0 +1,16 @@
[wrap-file]
directory = pcre2-10.40
source_url = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2
source_filename = pcre2-10.40.tar.bz2
source_hash = 14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68
patch_filename = pcre2_10.40-2_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.40-2/get_patch
patch_hash = 6c1bbb3c00ec3917b3abee922dedc19ad8b3a199db65ba893a61241e3428bdbd
wrapdb_version = 10.40-2
[provide]
libpcre2-8 = -libpcre2_8
libpcre2-16 = -libpcre2_16
libpcre2-32 = -libpcre2_32
libpcre2-posix = -libpcre2_posix