Skip to content

Commit

Permalink
Add R 0.15 and R 0.16
Browse files Browse the repository at this point in the history
  • Loading branch information
gaborcsardi committed Sep 25, 2023
1 parent 313ad2f commit 2d45618
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 0 deletions.
22 changes: 22 additions & 0 deletions r-builds/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@

services:
r-0.15:
image: "rhub/evercran-build:0.15"
build:
context: .
dockerfile: Dockerfile-sarge
args:
R_VERSION: 0.15
command: bash -c 'cp /build/*.deb /output'
volumes:
- ./output:/output

r-0.16:
image: "rhub/evercran-build:0.16"
build:
context: .
dockerfile: Dockerfile-sarge
args:
R_VERSION: 0.16
command: bash -c 'cp /build/*.deb /output'
volumes:
- ./output:/output

r-0.16.1:
image: "rhub/evercran-build:0.16.1"
build:
Expand Down
32 changes: 32 additions & 0 deletions r-builds/patch/R-0.15.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
diff --git a/src/library/profile/Rprofile.unix b/src/library/profile/Rprofile.unix
index f008e68..7783d77 100644
--- a/src/library/profile/Rprofile.unix
+++ b/src/library/profile/Rprofile.unix
@@ -17,4 +17,4 @@ version <- Version()
options(na.action="na.omit")
options(printcmd=getenv("R_PRINTCMD"))
options(papersize=getenv("R_PAPERSIZE"))
-if(interactive()) x11()
+
diff --git a/src/unix/system.c b/src/unix/system.c
index d25825f..45c509e 100644
--- a/src/unix/system.c
+++ b/src/unix/system.c
@@ -256,7 +256,7 @@ int main(int ac, char **av)
#endif

#ifdef linux
- __setfpucw(_FPU_IEEE);
+ /* __setfpucw(_FPU_IEEE); */
#endif

#ifdef HAVE_LIBREADLINE
@@ -323,7 +323,7 @@ qask:
#endif

#ifdef linux
- __setfpucw(_FPU_DEFAULT);
+ /* __setfpucw(_FPU_DEFAULT); */
#endif

exit(0);
31 changes: 31 additions & 0 deletions r-builds/patch/R-0.16.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/src/library/profile/Rprofile.unix b/src/library/profile/Rprofile.unix
index 97a62fc..ca998c1 100644
--- a/src/library/profile/Rprofile.unix
+++ b/src/library/profile/Rprofile.unix
@@ -9,4 +9,3 @@ version <- Version()
options(na.action="na.omit")
options(printcmd=getenv("R_PRINTCMD"))
options(papersize=getenv("R_PAPERSIZE"))
-if(interactive()) x11()
diff --git a/src/unix/system.c b/src/unix/system.c
index f217b26..7d7902a 100644
--- a/src/unix/system.c
+++ b/src/unix/system.c
@@ -256,7 +256,7 @@ int main(int ac, char **av)
#endif

#ifdef linux
- __setfpucw(_FPU_IEEE);
+ /* __setfpucw(_FPU_IEEE); */
#endif

#ifdef HAVE_LIBREADLINE
@@ -323,7 +323,7 @@ qask:
#endif

#ifdef linux
- __setfpucw(_FPU_DEFAULT);
+ /* __setfpucw(_FPU_DEFAULT); */
#endif

exit(0);

0 comments on commit 2d45618

Please sign in to comment.