From 45e97bb0e4ab838a33ab8460b4f5c1b439c03eb6 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Wed, 17 Jun 2015 15:58:14 +0700 Subject: [PATCH] academic/R: Add patch. This will enable rstudio-desktop to be built. Signed-off-by: Willy Sudiarto Raharjo --- academic/R/R.SlackBuild | 6 ++++-- academic/R/extern.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 academic/R/extern.patch diff --git a/academic/R/R.SlackBuild b/academic/R/R.SlackBuild index 15ce145c92..e684e41dae 100644 --- a/academic/R/R.SlackBuild +++ b/academic/R/R.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=R VERSION=${VERSION:-3.2.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ "${R_SHLIB:-yes}" = "yes" ]; then @@ -79,7 +79,9 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +patch -p0 < $CWD/extern.patch CFLAG="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/academic/R/extern.patch b/academic/R/extern.patch new file mode 100644 index 0000000000..e1c67945ad --- /dev/null +++ b/academic/R/extern.patch @@ -0,0 +1,12 @@ +--- src/include/Rinterface.h (revision 66251) ++++ src/include/Rinterface.h (working copy) +@@ -84,7 +84,7 @@ + void fpu_setup(Rboolean); + + /* in unix/system.c */ +-int R_running_as_main_program; ++extern int R_running_as_main_program; + + #ifdef CSTACK_DEFNS + /* duplicating Defn.h */ +