From e3b92cab24f3affc329ee8648d60bf330e75878c Mon Sep 17 00:00:00 2001
From: Joshua Spiewak <jss@rstudio.com>
Date: Mon, 27 Apr 2020 15:31:17 -0400
Subject: [PATCH] Add pcre2

Which is actually newer than what is called libpcre3.
---
 builder/Dockerfile.ubuntu-1604 | 2 +-
 builder/Dockerfile.ubuntu-1804 | 2 +-
 builder/package.ubuntu-1604    | 1 +
 builder/package.ubuntu-1804    | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/builder/Dockerfile.ubuntu-1604 b/builder/Dockerfile.ubuntu-1604
index 241091c..ceec947 100644
--- a/builder/Dockerfile.ubuntu-1604
+++ b/builder/Dockerfile.ubuntu-1604
@@ -6,7 +6,7 @@ RUN set -x \
   && sed -i "s|# deb-src|deb-src|g" /etc/apt/sources.list \
   && export DEBIAN_FRONTEND=noninteractive \
   && apt-get update \
-  && apt-get install -y libcurl4-openssl-dev libicu-dev libopenblas-base wget python-pip ruby ruby-dev \
+  && apt-get install -y libcurl4-openssl-dev libicu-dev libopenblas-base libpcre2-dev wget python-pip ruby ruby-dev \
   && apt-get build-dep -y r-base
 
 RUN pip install awscli
diff --git a/builder/Dockerfile.ubuntu-1804 b/builder/Dockerfile.ubuntu-1804
index df5f3ec..6824c0b 100644
--- a/builder/Dockerfile.ubuntu-1804
+++ b/builder/Dockerfile.ubuntu-1804
@@ -6,7 +6,7 @@ RUN set -x \
   && sed -i "s|# deb-src|deb-src|g" /etc/apt/sources.list \
   && export DEBIAN_FRONTEND=noninteractive \
   && apt-get update \
-  && apt-get install -y libcurl4-openssl-dev libicu-dev libopenblas-base wget python-pip ruby ruby-dev \
+  && apt-get install -y libcurl4-openssl-dev libicu-dev libopenblas-base libpcre2-dev wget python-pip ruby ruby-dev \
   && apt-get build-dep -y r-base
 
 RUN pip install awscli
diff --git a/builder/package.ubuntu-1604 b/builder/package.ubuntu-1604
index 395020d..abe4ee6 100644
--- a/builder/package.ubuntu-1604
+++ b/builder/package.ubuntu-1604
@@ -33,6 +33,7 @@ fpm \
   -d libpango-1.0-0 \
   -d libpangocairo-1.0-0 \
   -d libpaper-utils \
+  -d libpcre2 \
   -d libpcre3 \
   -d libpng16-16 \
   -d libreadline6 \
diff --git a/builder/package.ubuntu-1804 b/builder/package.ubuntu-1804
index 2e59f8f..d2afbac 100644
--- a/builder/package.ubuntu-1804
+++ b/builder/package.ubuntu-1804
@@ -33,6 +33,7 @@ fpm \
   -d libpango-1.0-0 \
   -d libpangocairo-1.0-0 \
   -d libpaper-utils \
+  -d libpcre2 \
   -d libpcre3 \
   -d libpng16-16 \
   -d libreadline7 \