summaryrefslogtreecommitdiffstats
path: root/academic
diff options
context:
space:
mode:
author Willy Sudiarto Raharjo <willysr@slackbuilds.org>2015-06-17 15:58:14 +0700
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2015-06-17 15:58:14 +0700
commit45e97bb0e4ab838a33ab8460b4f5c1b439c03eb6 (patch)
tree75e5c4c5888f5fee5f73c67b0acf84aff726366c /academic
parent8757e30fa6033da9fc8a225abcbbc0db15bf2dcc (diff)
downloadslackbuilds-45e97bb0e4ab838a33ab8460b4f5c1b439c03eb6.tar.gz
slackbuilds-45e97bb0e4ab838a33ab8460b4f5c1b439c03eb6.tar.xz
academic/R: Add patch.
This will enable rstudio-desktop to be built. Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'academic')
-rw-r--r--academic/R/R.SlackBuild6
-rw-r--r--academic/R/extern.patch12
2 files changed, 16 insertions, 2 deletions
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 */
+