From bd399574d6b2bf7faa15c04c2bda03b73c16a011 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Tue, 9 Jul 2019 10:37:22 +0200
Subject: Fix the Alpine Linux build

pcre is not bundled with PHP anymore in AlpineLinux,
so we have to install it separately.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85b03eb..639f277 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ testsuite:alpine:
   stage: testsuite
   script:
     - apk update
-    - apk add php7-dev php7-cgi php7-simplexml php7-xml make gcc musl-dev pcre
+    - apk add php7-dev php7-cgi php7-simplexml php7-xml make gcc musl-dev pcre-dev
     - make compile_debug
     - TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make -C src test TESTS="tests/cookies_encryption tests/deny_writable tests/disable_function"
     - TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make -C src test TESTS="tests/dump_request tests/eval_blacklist tests/global_strict"
-- 
cgit v1.3


From 92584082f9a86243f8155889dbcc2716e09750f4 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Wed, 10 Jul 2019 20:32:56 +0200
Subject: Fix the Debian build on gitlab

Apparently, pcre isn't a hard dependency for php anymore.
We're using pcre2, because pcre3 is actually pcre in Debian,
because why not.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 639f277..40dcd0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ testsuite:debian:
   stage: testsuite
   script:
     - apt-get -qqy update
-    - apt-get -qqy install --no-install-recommends php-dev gcc make
+    - apt-get -qqy install --no-install-recommends php-dev gcc make libpcre2-dev
     - make debug
 
 testsuite:fedora:
-- 
cgit v1.3


From f7e25b29c1cd5273675dbb3d6883c40377d8315d Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Wed, 10 Jul 2019 21:18:29 +0200
Subject: Use pcre3 on Debian in gitlab's CI for now.

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40dcd0a..73181c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ testsuite:debian:
   stage: testsuite
   script:
     - apt-get -qqy update
-    - apt-get -qqy install --no-install-recommends php-dev gcc make libpcre2-dev
+    - apt-get -qqy install --no-install-recommends php-dev gcc make libpcre3-dev
     - make debug
 
 testsuite:fedora:
-- 
cgit v1.3