From 650d3650ce13da3a83205d4d57226fecfcf73e14 Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Thu, 14 May 2020 13:56:58 -0500 Subject: [PATCH] Switch to dev PCRE in Ubuntu/Debian packages For consistency with CentOS and SUSE, and because packages that link against libR like rJava need PCRE dev headers to install from source. --- builder/package.debian-10 | 4 ++-- builder/package.debian-9 | 4 ++-- builder/package.ubuntu-1604 | 4 ++-- builder/package.ubuntu-1804 | 4 ++-- builder/package.ubuntu-2004 | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/builder/package.debian-10 b/builder/package.debian-10 index 5d9dfc9..c010223 100644 --- a/builder/package.debian-10 +++ b/builder/package.debian-10 @@ -5,9 +5,9 @@ if [[ ! -d /tmp/output/debian-10 ]]; then fi # R 3.x requires PCRE1 -pcre_lib='libpcre2-8-0' +pcre_lib='libpcre2-dev' if [[ "${R_VERSION}" =~ ^3 ]]; then - pcre_lib='libpcre3' + pcre_lib='libpcre3-dev' fi fpm \ diff --git a/builder/package.debian-9 b/builder/package.debian-9 index b60d330..5842f3d 100644 --- a/builder/package.debian-9 +++ b/builder/package.debian-9 @@ -5,9 +5,9 @@ if [[ ! -d /tmp/output/debian-9 ]]; then fi # R 3.x requires PCRE1 -pcre_lib='libpcre2-8-0' +pcre_lib='libpcre2-dev' if [[ "${R_VERSION}" =~ ^3 ]]; then - pcre_lib='libpcre3' + pcre_lib='libpcre3-dev' fi fpm \ diff --git a/builder/package.ubuntu-1604 b/builder/package.ubuntu-1604 index e9c9034..e52065e 100644 --- a/builder/package.ubuntu-1604 +++ b/builder/package.ubuntu-1604 @@ -5,9 +5,9 @@ if [[ ! -d /tmp/output/ubuntu-1604 ]]; then fi # R 3.x requires PCRE1 -pcre_lib='libpcre2-8-0' +pcre_lib='libpcre2-dev' if [[ "${R_VERSION}" =~ ^3 ]]; then - pcre_lib='libpcre3' + pcre_lib='libpcre3-dev' fi fpm \ diff --git a/builder/package.ubuntu-1804 b/builder/package.ubuntu-1804 index 2d9d8d5..19eeebc 100644 --- a/builder/package.ubuntu-1804 +++ b/builder/package.ubuntu-1804 @@ -5,9 +5,9 @@ if [[ ! -d /tmp/output/ubuntu-1804 ]]; then fi # R 3.x requires PCRE1 -pcre_lib='libpcre2-8-0' +pcre_lib='libpcre2-dev' if [[ "${R_VERSION}" =~ ^3 ]]; then - pcre_lib='libpcre3' + pcre_lib='libpcre3-dev' fi fpm \ diff --git a/builder/package.ubuntu-2004 b/builder/package.ubuntu-2004 index f615651..9199b7b 100644 --- a/builder/package.ubuntu-2004 +++ b/builder/package.ubuntu-2004 @@ -5,9 +5,9 @@ if [[ ! -d /tmp/output/ubuntu-2004 ]]; then fi # R 3.x requires PCRE1 -pcre_lib='libpcre2-8-0' +pcre_lib='libpcre2-dev' if [[ "${R_VERSION}" =~ ^3 ]]; then - pcre_lib='libpcre3' + pcre_lib='libpcre3-dev' fi fpm \