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

Fix R 3.3.0-3.3.2 builds

Browse source
This commit is contained in:
Gábor Csárdi 2023-07-19 11:07:37 +02:00
commit 33c666c5b4
11 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
builder/Dockerfile.centos-7
View file

@ -73,4 +73,5 @@ ENV R_RD4PDF="times,hyper"
COPY package.centos-7 /package.sh
COPY build.sh .
COPY patches /patches
ENTRYPOINT ./build.sh

1
builder/Dockerfile.centos-8
View file

@ -74,4 +74,5 @@ ENV R_RD4PDF="times,hyper"
COPY package.centos-8 /package.sh
COPY build.sh .
COPY patches /patches
ENTRYPOINT ./build.sh

1
builder/Dockerfile.debian-10
View file

@ -23,4 +23,5 @@ ENV PAGER /usr/bin/pager
COPY package.debian-10 /package.sh
COPY build.sh .
COPY patches /patches
ENTRYPOINT ./build.sh

1
builder/Dockerfile.debian-11
View file

@ -26,4 +26,5 @@ ENV INCLUDE_PCRE2_IN_R_3 yes
COPY package.debian-11 /package.sh
COPY build.sh .
COPY patches /patches
ENTRYPOINT ./build.sh

1
builder/Dockerfile.debian-12
View file

@ -30,4 +30,5 @@ ENV INCLUDE_PCRE2_IN_R_3 yes
COPY package.debian-12 /package.sh
COPY build.sh .
COPY patches /patches
ENTRYPOINT ./build.sh

1
builder/Dockerfile.opensuse-154
View file

@ -99,4 +99,5 @@ ENV JAVA_HOME=/usr/lib64/jvm/jre-11-openjdk
COPY package.opensuse-154 /package.sh
COPY build.sh .
COPY patches /patches
ENTRYPOINT ./build.sh

1
builder/Dockerfile.rhel-9
View file

@ -90,4 +90,5 @@ ENV INCLUDE_PCRE2_IN_R_3 yes
COPY package.rhel-9 /package.sh
COPY build.sh .
COPY patches /patches
ENTRYPOINT ./build.sh

1
builder/Dockerfile.ubuntu-2004
View file

@ -22,4 +22,5 @@ ENV PAGER /usr/bin/pager
COPY package.ubuntu-2004 /package.sh
COPY build.sh .
COPY patches /patches
ENTRYPOINT ./build.sh

1
builder/Dockerfile.ubuntu-2204
View file

@ -25,4 +25,5 @@ ENV INCLUDE_PCRE2_IN_R_3 yes
COPY package.ubuntu-2204 /package.sh
COPY build.sh .
COPY patches /patches
ENTRYPOINT ./build.sh

4
builder/build.sh
View file

@ -71,6 +71,10 @@ patch_r() {
if [ -f "/patches/R-${1}.patch" ]; then
patch -p1 < "/patches/R-${1}.patch"
fi
if [ -f "/patches/R-${1}-${OS_IDENTIFIER}.patch" ]; then
patch -p1 < "/patches/R-${1}-${OS_IDENTIFIER}.patch"
fi
}
# compile_r() - $1 as r version

12
builder/patches/README.md
View file

@ -1,9 +1,9 @@
# Patches
Patches can be applied for specific R versions and platforms. To add a patch, create a patch file
at `patches/R-${R_VERSION}.patch` (such as `patches/R-devel.patch`), and add the following line
to the platform Dockerfile:
Patches can be applied for specific R versions and platforms. To add a patch for an R version on
all platforms, create a patch file at `patches/R-${R_VERSION}.patch` (such as
`patches/R-devel.patch`).
```dockerfile
COPY patches /patches
```
To add a patch for an R version on a specific platform create a patch file at
`patches/R-${R_VERSION}-${OS_IDENTIFIER}.patch` (such as
`patches/R-3.3.0-centos-8.patch`).