diff --git a/builder/build.sh b/builder/build.sh index 8505583..565a677 100755 --- a/builder/build.sh +++ b/builder/build.sh @@ -97,7 +97,7 @@ compile_r() { # # The INCLUDE_PCRE2_IN_R_3 environment variable can be set to include PCRE2 # in R 3.x builds, for distributions where PCRE2 is always required. - # In Debian 11/Ubuntu 22, Pango now depends on PCRE2, so R 3.x will not be compiled with + # In Debian 11/Ubuntu 22/RHEL 9, Pango now depends on PCRE2, so R 3.x will not be compiled with # Pango support if the PCRE2 pkg-config file is missing. if [[ "${1}" =~ ^3 ]] && pkg-config --exists libpcre2-8 && [ -z "$INCLUDE_PCRE2_IN_R_3" ]; then mkdir -p /tmp/pcre2 diff --git a/builder/package.rhel-9 b/builder/package.rhel-9 index 064bacf..5144ba8 100644 --- a/builder/package.rhel-9 +++ b/builder/package.rhel-9 @@ -4,10 +4,11 @@ if [[ ! -d /tmp/output/${OS_IDENTIFIER} ]]; then mkdir -p "/tmp/output/${OS_IDENTIFIER}" fi -# R 3.x requires PCRE1 -pcre_lib='pcre2-devel' +# R 3.x requires PCRE1. On RHEL 9, R 3.x also requires PCRE2 for Pango support. +pcre_libs='- pcre2-devel' if [[ "${R_VERSION}" =~ ^3 ]]; then - pcre_lib='pcre-devel' + pcre_libs='- pcre2-devel +- pcre-devel' fi # Create post-install script required for OpenBLAS. @@ -64,7 +65,7 @@ depends: - make - openblas-devel - pango -- ${pcre_lib} +${pcre_libs} - tcl - tk - unzip