From 397e69fd514a4306e6d28ec24f1b533b545e807a Mon Sep 17 00:00:00 2001 From: Alexandre Rossi Date: Tue, 25 Jul 2023 08:01:37 +0200 Subject: [PATCH] fixup! switch to pcre2 --- .github/workflows/compile-test.yml | 2 +- .github/workflows/test.yml | 2 +- check/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/compile-test.yml b/.github/workflows/compile-test.yml index ebfdb68164..8bea39026c 100644 --- a/.github/workflows/compile-test.yml +++ b/.github/workflows/compile-test.yml @@ -16,7 +16,7 @@ jobs: run: | sudo apt update -qq sudo apt install --no-install-recommends -qqyf python3.6-dev \ - libxml2-dev libpcre3-dev libcap2-dev \ + libxml2-dev libpcre2-dev libcap2-dev \ php7.2-dev libphp7.2-embed libargon2-0-dev libsodium-dev \ liblua5.1-0-dev ruby2.5-dev \ libjansson-dev libldap2-dev libpq-dev \ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0d767be4ea..a0c7ff633b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: run: | sudo apt update -qq sudo apt install --no-install-recommends -qqyf python${{ matrix.python-version }}-dev \ - libpcre3-dev libjansson-dev libcap2-dev \ + libpcre2-dev libjansson-dev libcap2-dev \ curl check - name: Install distutils if: contains(fromJson('["3.8","3.9","3.10","3.11"]'), matrix.python-version) diff --git a/check/Makefile b/check/Makefile index ac69b37891..a9a6555769 100644 --- a/check/Makefile +++ b/check/Makefile @@ -4,7 +4,7 @@ LDFLAGS = $(shell pkg-config --libs check) LDFLAGS += -ldl -lz LDFLAGS += $(shell xml2-config --libs) LDFLAGS += $(shell pkg-config --libs openssl) -LDFLAGS += $(shell pcre-config --libs) +LDFLAGS += $(shell pcre2-config --libs8) LDFLAGS += $(shell pkg-config --libs jansson) UNAME_S := $(shell uname -s)