Merge pull request #63 from rstudio/pcre

Remove PCRE2 dependency for R 3.x; add libs required to link against R library

builder/build.sh

@@ -65,6 +65,20 @@ compile_r() {
     build_flag=''
   fi
 
+  # Avoid a PCRE2 dependency for R 3.5 and 3.6. R 3.x uses PCRE1, but R 3.5+
+  # will link against PCRE2 if present, although it is not actually used.
+  # Since there's no way to disable this in the configure script, and we need
+  # PCRE2 for R 4.x, we hide PCRE2 from the configure script by temporarily
+  # removing the pkg-config file and pcre2-config script.
+  if [[ "${1}" =~ ^3 ]] && pkg-config --exists libpcre2-8; then
+    mkdir -p /tmp/pcre2
+    pc_dir=$(pkg-config --variable pcfiledir libpcre2-8)
+    mv ${pc_dir}/libpcre2-8.pc /tmp/pcre2
+    config_bin=$(which pcre2-config)
+    mv ${config_bin} /tmp/pcre2
+    trap "{ mv /tmp/pcre2/libpcre2-8.pc ${pc_dir}; mv /tmp/pcre2/pcre2-config ${config_bin}; }" EXIT
+  fi
+
   # Default configure options. Some Dockerfiles override this with an ENV directive.
   default_configure_options="\
     --enable-R-shlib \

builder/package.centos-6

@@ -4,6 +4,12 @@ if [[ ! -d /tmp/output/centos-6 ]]; then
   mkdir -p /tmp/output/centos-6
 fi
 
+# R 3.x requires PCRE1
+pcre_lib='pcre2-devel'
+if [[ "${R_VERSION}" =~ ^3 ]]; then
+  pcre_lib='pcre-devel'
+fi
+
 # create post-install script required for openblas
 cat <<EOF >> /post-install.sh
 mv /opt/R/${R_VERSION}/lib/R/lib/libRblas.so /opt/R/${R_VERSION}/lib/R/lib/libRblas.so.keep 
@@ -60,8 +66,7 @@ fpm \
   -d make \
   -d openblas-devel \
   -d pango \
-  -d pcre-devel \
-  -d pcre2-devel \
+  -d ${pcre_lib} \
   -d tcl \
   -d tk \
   -d unzip \

builder/package.centos-7

@@ -4,6 +4,12 @@ if [[ ! -d /tmp/output/centos-7 ]]; then
   mkdir -p /tmp/output/centos-7
 fi
 
+# R 3.x requires PCRE1
+pcre_lib='pcre2-devel'
+if [[ "${R_VERSION}" =~ ^3 ]]; then
+  pcre_lib='pcre-devel'
+fi
+
 # create post-install script required for openblas
 cat <<EOF >> /post-install.sh
 mv /opt/R/${R_VERSION}/lib/R/lib/libRblas.so /opt/R/${R_VERSION}/lib/R/lib/libRblas.so.keep 
@@ -45,8 +51,7 @@ fpm \
   -d make \
   -d openblas-devel \
   -d pango \
-  -d pcre-devel \
-  -d pcre2-devel \
+  -d ${pcre_lib} \
   -d tcl \
   -d tk \
   -d unzip \

builder/package.centos-8

@@ -2,6 +2,12 @@ if [[ ! -d /tmp/output/centos-8 ]]; then
   mkdir -p /tmp/output/centos-8
 fi
 
+# R 3.x requires PCRE1
+pcre_lib='pcre2-devel'
+if [[ "${R_VERSION}" =~ ^3 ]]; then
+  pcre_lib='pcre-devel'
+fi
+
 # create post-install script required for openblas
 cat <<EOF >> /post-install.sh
 mv /opt/R/${R_VERSION}/lib/R/lib/libRblas.so /opt/R/${R_VERSION}/lib/R/lib/libRblas.so.keep
@@ -43,8 +49,7 @@ fpm \
   -d make \
   -d openblas-threads \
   -d pango \
-  -d pcre-devel \
-  -d pcre2-devel \
+  -d ${pcre_lib} \
   -d tcl \
   -d tk \
   -d unzip \

builder/package.debian-10

@@ -4,6 +4,12 @@ if [[ ! -d /tmp/output/debian-10 ]]; then
   mkdir -p /tmp/output/debian-10
 fi
 
+# R 3.x requires PCRE1
+pcre_lib='libpcre2-dev'
+if [[ "${R_VERSION}" =~ ^3 ]]; then
+  pcre_lib='libpcre3-dev'
+fi
+
 fpm \
   -s dir \
   -t deb \
@@ -21,20 +27,19 @@ fpm \
   -d g++ \
   -d gcc \
   -d gfortran \
-  -d libbz2-1.0 \
+  -d libbz2-dev \
   -d libc6 \
   -d libcairo2 \
   -d libcurl4-openssl-dev \
   -d libglib2.0-0 \
   -d libgomp1 \
-  -d libicu63 \
-  -d liblzma5 \
+  -d libicu-dev \
+  -d liblzma-dev \
   -d libopenblas-dev \
   -d libpango-1.0-0 \
   -d libpangocairo-1.0-0 \
   -d libpaper-utils \
-  -d libpcre2-8-0 \
-  -d libpcre3 \
+  -d ${pcre_lib} \
   -d libpng16-16 \
   -d libreadline7 \
   -d libtcl8.6 \
@@ -46,7 +51,7 @@ fpm \
   -d ucf \
   -d unzip \
   -d zip \
-  -d zlib1g \
+  -d zlib1g-dev \
   /opt/R/${R_VERSION}
 
 shopt -s extglob

builder/package.debian-9

@@ -4,6 +4,12 @@ if [[ ! -d /tmp/output/debian-9 ]]; then
   mkdir -p /tmp/output/debian-9
 fi
 
+# R 3.x requires PCRE1
+pcre_lib='libpcre2-dev'
+if [[ "${R_VERSION}" =~ ^3 ]]; then
+  pcre_lib='libpcre3-dev'
+fi
+
 fpm \
   -s dir \
   -t deb \
@@ -21,20 +27,19 @@ fpm \
   -d g++ \
   -d gcc \
   -d gfortran \
-  -d libbz2-1.0 \
+  -d libbz2-dev \
   -d libc6 \
   -d libcairo2 \
   -d libcurl4-openssl-dev \
   -d libglib2.0-0 \
   -d libgomp1 \
-  -d libicu57 \
-  -d liblzma5 \
+  -d libicu-dev \
+  -d liblzma-dev \
   -d libopenblas-dev \
   -d libpango-1.0-0 \
   -d libpangocairo-1.0-0 \
   -d libpaper-utils \
-  -d libpcre2-8-0 \
-  -d libpcre3 \
+  -d ${pcre_lib} \
   -d libpng16-16 \
   -d libreadline7 \
   -d libtcl8.6 \
@@ -46,7 +51,7 @@ fpm \
   -d ucf \
   -d unzip \
   -d zip \
-  -d zlib1g \
+  -d zlib1g-dev \
   /opt/R/${R_VERSION}
 
 shopt -s extglob

builder/package.opensuse-15

@@ -4,6 +4,12 @@ if [[ ! -d /tmp/output/opensuse-15 ]]; then
   mkdir -p /tmp/output/opensuse-15
 fi
 
+# R 3.x requires PCRE1
+pcre_lib='pcre2-devel'
+if [[ "${R_VERSION}" =~ ^3 ]]; then
+  pcre_lib='pcre-devel'
+fi
+
 # create post-install script required for openblas
 cat <<EOF >> /post-install.sh
 mv /opt/R/${R_VERSION}/lib/R/lib/libRblas.so /opt/R/${R_VERSION}/lib/R/lib/libRblas.so.keep
@@ -50,8 +56,7 @@ fpm \
   -d libtiff5 \
   -d make \
   -d openblas-devel \
-  -d pcre-devel \
-  -d pcre2-devel \
+  -d ${pcre_lib} \
   -d tar \
   -d tcl \
   -d tk \

builder/package.opensuse-42

@@ -4,6 +4,12 @@ if [[ ! -d /tmp/output/opensuse-42 ]]; then
   mkdir -p /tmp/output/opensuse-42
 fi
 
+# R 3.x requires PCRE1
+pcre_lib='pcre2-devel'
+if [[ "${R_VERSION}" =~ ^3 ]]; then
+  pcre_lib='pcre-devel'
+fi
+
 # create post-install script required for openblas
 cat <<EOF >> /post-install.sh
 mv /opt/R/${R_VERSION}/lib/R/lib/libRblas.so /opt/R/${R_VERSION}/lib/R/lib/libRblas.so.keep
@@ -48,8 +54,7 @@ fpm \
   -d libtiff5 \
   -d make \
   -d openblas-devel \
-  -d pcre-devel \
-  -d pcre2-devel \
+  -d ${pcre_lib} \
   -d tar \
   -d tcl \
   -d tk \

builder/package.ubuntu-1604

@@ -4,6 +4,12 @@ if [[ ! -d /tmp/output/ubuntu-1604 ]]; then
   mkdir -p /tmp/output/ubuntu-1604
 fi
 
+# R 3.x requires PCRE1
+pcre_lib='libpcre2-dev'
+if [[ "${R_VERSION}" =~ ^3 ]]; then
+  pcre_lib='libpcre3-dev'
+fi
+
 fpm \
   -s dir \
   -t deb \
@@ -20,21 +26,20 @@ fpm \
   -d g++ \
   -d gcc \
   -d gfortran \
-  -d libbz2-1.0 \
+  -d libbz2-dev \
   -d libc6 \
   -d libcairo2 \
   -d libcurl3 \
   -d libglib2.0-0 \
   -d libgomp1 \
-  -d libicu55 \
+  -d libicu-dev \
   -d libjpeg8 \
-  -d liblzma5 \
+  -d liblzma-dev \
   -d libopenblas-dev \
   -d libpango-1.0-0 \
   -d libpangocairo-1.0-0 \
   -d libpaper-utils \
-  -d libpcre2-8-0 \
-  -d libpcre3 \
+  -d ${pcre_lib} \
   -d libpng16-16 \
   -d libreadline6 \
   -d libtcl8.6 \
@@ -46,7 +51,7 @@ fpm \
   -d ucf \
   -d unzip \
   -d zip \
-  -d zlib1g \
+  -d zlib1g-dev \
   /opt/R/${R_VERSION}
 
 shopt -s extglob

builder/package.ubuntu-1804

@@ -4,6 +4,12 @@ if [[ ! -d /tmp/output/ubuntu-1804 ]]; then
   mkdir -p /tmp/output/ubuntu-1804
 fi
 
+# R 3.x requires PCRE1
+pcre_lib='libpcre2-dev'
+if [[ "${R_VERSION}" =~ ^3 ]]; then
+  pcre_lib='libpcre3-dev'
+fi
+
 fpm \
   -s dir \
   -t deb \
@@ -20,21 +26,20 @@ fpm \
   -d g++ \
   -d gcc \
   -d gfortran \
-  -d libbz2-1.0 \
+  -d libbz2-dev \
   -d libc6 \
   -d libcairo2 \
   -d libcurl4 \
   -d libglib2.0-0 \
   -d libgomp1 \
-  -d libicu60 \
+  -d libicu-dev \
   -d libjpeg8 \
-  -d liblzma5 \
+  -d liblzma-dev \
   -d libopenblas-dev \
   -d libpango-1.0-0 \
   -d libpangocairo-1.0-0 \
   -d libpaper-utils \
-  -d libpcre2-8-0 \
-  -d libpcre3 \
+  -d ${pcre_lib} \
   -d libpng16-16 \
   -d libreadline7 \
   -d libtcl8.6 \
@@ -46,7 +51,7 @@ fpm \
   -d ucf \
   -d unzip \
   -d zip \
-  -d zlib1g \
+  -d zlib1g-dev \
   /opt/R/${R_VERSION}
 
 shopt -s extglob

builder/package.ubuntu-2004

@@ -4,6 +4,12 @@ if [[ ! -d /tmp/output/ubuntu-2004 ]]; then
   mkdir -p /tmp/output/ubuntu-2004
 fi
 
+# R 3.x requires PCRE1
+pcre_lib='libpcre2-dev'
+if [[ "${R_VERSION}" =~ ^3 ]]; then
+  pcre_lib='libpcre3-dev'
+fi
+
 fpm \
   -s dir \
   -t deb \
@@ -20,22 +26,21 @@ fpm \
   -d g++ \
   -d gcc \
   -d gfortran \
-  -d libbz2-1.0 \
+  -d libbz2-dev \
   -d libblas-dev \
   -d libc6 \
   -d libcairo2 \
   -d libcurl4 \
   -d libglib2.0-0 \
   -d libgomp1 \
-  -d libicu66 \
+  -d libicu-dev \
   -d libjpeg8 \
   -d liblapack-dev \
-  -d liblzma5 \
+  -d liblzma-dev \
   -d libpango-1.0-0 \
   -d libpangocairo-1.0-0 \
   -d libpaper-utils \
-  -d libpcre2-8-0 \
-  -d libpcre3 \
+  -d ${pcre_lib} \
   -d libpng16-16 \
   -d libreadline8 \
   -d libtcl8.6 \
@@ -47,7 +52,7 @@ fpm \
   -d ucf \
   -d unzip \
   -d zip \
-  -d zlib1g \
+  -d zlib1g-dev \
   /opt/R/${R_VERSION}
 
 shopt -s extglob