devxy/r-builds
Watch
2
0
Fork
You've already forked r-builds
 0
Code Issues 1 Pull requests Releases Activity

fix: remove libpcre3-dev from Ubuntu 26.04 build, not available in this release

Browse source
This commit is contained in:
Patrick Schratz 2026-04-24 13:38:48 +02:00
commit db8dd66a07
Signed by: pat-s
GPG key ID: 3C6318841EF78925
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
builder/Dockerfile.ubuntu-2604
View file

@ -6,7 +6,7 @@ RUN set -x \
&& sed -i "s|Types: deb|Types: deb deb-src|g" /etc/apt/sources.list.d/ubuntu.sources \ && sed -i "s|Types: deb|Types: deb deb-src|g" /etc/apt/sources.list.d/ubuntu.sources \
&& export DEBIAN_FRONTEND=noninteractive \ && export DEBIAN_FRONTEND=noninteractive \
&& apt update \ && apt update \
&& apt install -y curl libcurl4-openssl-dev libicu-dev libopenblas0-pthread libpcre2-dev libpcre3-dev unzip wget \ && apt install -y curl libcurl4-openssl-dev libicu-dev libopenblas0-pthread libpcre2-dev unzip wget \
&& apt build-dep -y r-base && apt build-dep -y r-base
# Install s5cmd for S3 uploads (much faster than AWS CLI) # Install s5cmd for S3 uploads (much faster than AWS CLI)

6
builder/package.ubuntu-2604
View file

@ -4,12 +4,8 @@ if [[ ! -d /tmp/output/${OS_IDENTIFIER} ]]; then
mkdir -p "/tmp/output/${OS_IDENTIFIER}" mkdir -p "/tmp/output/${OS_IDENTIFIER}"
fi fi
# R 3.x requires PCRE1. On Ubuntu 26, R 3.x also requires PCRE2 for Pango support. # PCRE1 (libpcre3-dev) is not available on Ubuntu 26.04, use PCRE2 only.
pcre_libs='- libpcre2-dev' pcre_libs='- libpcre2-dev'
if [[ "${R_VERSION}" =~ ^3 ]]; then
pcre_libs='- libpcre2-dev
- libpcre3-dev'
fi
deflate_libs='# - libdeflate-dev' deflate_libs='# - libdeflate-dev'
if grep -q '^LIBS *=.*[-]ldeflate' ${R_INSTALL_PATH}/lib/R/etc/Makeconf; then if grep -q '^LIBS *=.*[-]ldeflate' ${R_INSTALL_PATH}/lib/R/etc/Makeconf; then