[glib/wip/pwithnall/ci-image-updates: 1/2] ci: Add libpcre2 dependencies and subproject
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/pwithnall/ci-image-updates: 1/2] ci: Add libpcre2 dependencies and subproject
- Date: Fri, 24 Jun 2022 11:53:43 +0000 (UTC)
commit 76d4e23af428380ca13b9f1f51d2fd26b6bba8d3
Author: Philip Withnall <pwithnall endlessos org>
Date: Fri Jun 24 12:50:26 2022 +0100
ci: Add libpcre2 dependencies and subproject
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
.gitlab-ci/debian-stable.Dockerfile | 1 +
.gitlab-ci/fedora.Dockerfile | 1 +
.gitlab-ci/mingw.Dockerfile | 1 +
.gitlab-ci/test-msys2.sh | 1 +
subprojects/pcre2.wrap | 8 ++++++++
5 files changed, 12 insertions(+)
---
diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
index fc70312714..675ec40a57 100644
--- a/.gitlab-ci/debian-stable.Dockerfile
+++ b/.gitlab-ci/debian-stable.Dockerfile
@@ -26,6 +26,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
libffi-dev \
libmount-dev \
libpcre3-dev \
+ libpcre2-dev \
libselinux1-dev \
libxml2-utils \
libxslt1-dev \
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index d67cd35115..234515b7d4 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -43,6 +43,7 @@ RUN dnf -y update \
ncurses-compat-libs \
ninja-build \
pcre-devel \
+ pcre2-devel \
"python3-dbusmock >= 0.18.3-2" \
python3-pip \
python3-pygments \
diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile
index 904fc1211d..5fe5e67ded 100644
--- a/.gitlab-ci/mingw.Dockerfile
+++ b/.gitlab-ci/mingw.Dockerfile
@@ -44,6 +44,7 @@ RUN dnf -y install \
ncurses-compat-libs \
ninja-build \
pcre-devel \
+ pcre2-devel \
python3 \
python3-pip \
python3-wheel \
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 85ed88f3fe..d891ee008f 100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -19,6 +19,7 @@ pacman --noconfirm -S --needed \
mingw-w64-$MSYS2_ARCH-libffi \
mingw-w64-$MSYS2_ARCH-meson \
mingw-w64-$MSYS2_ARCH-pcre \
+ mingw-w64-$MSYS2_ARCH-pcre2 \
mingw-w64-$MSYS2_ARCH-python3 \
mingw-w64-$MSYS2_ARCH-python-pip \
mingw-w64-$MSYS2_ARCH-toolchain \
diff --git a/subprojects/pcre2.wrap b/subprojects/pcre2.wrap
new file mode 100644
index 0000000000..17a81c5498
--- /dev/null
+++ b/subprojects/pcre2.wrap
@@ -0,0 +1,8 @@
+[wrap-file]
+directory = pcre2-10.39
+source_url = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-10.39.tar.bz2
+source_filename = pcre2-10.39.tar.bz2
+source_hash = 0f03caf57f81d9ff362ac28cd389c055ec2bf0678d277349a1a4bee00ad6d440
+patch_filename = pcre2_10.39-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.39-2/get_patch
+patch_hash = c4cfffff83e7bb239c8c330339b08f4367b019f79bf810f10c415e35fb09cf14
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]