summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 38450de7fef..4335e8da7be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = rstudio-server-git
pkgdesc = A new integrated development environment (IDE) for R programming language
- pkgver = v1.2.1330.r1180.g655da0f077
+ pkgver = v1.2.5001.r1361.g5b19513f7e
pkgrel = 1
url = http://www.rstudio.org/
install = rstudio-server-git.install
diff --git a/PKGBUILD b/PKGBUILD
index 01534de16a5..5eb6ad582d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
#
pkgname=rstudio-server-git
_gitname="rstudio"
-pkgver=v1.2.1330.r1180.g655da0f077
+pkgver=v1.2.5001.r1361.g5b19513f7e
_gwtver=2.8.2
_ginver=2.1.2
_clangver=3.8.0
@@ -77,7 +77,7 @@ build() {
cd "${srcdir}/$_gitname/build"
# Configure cmake
#cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server -DCMAKE_DL_LIBRARIES=/usr/lib64/libdl.so -DCMAKE_LIBR_DOC_DIR=/usr/share/doc/R -DCMAKE_LIBR_EXECUTABLE=/usr/bin/R -DCMAKE_LIBR_HOME=/usr/lib64/R -DCMAKE_LIBR_INCLUDE_DIRS=/usr/include/R -DCMAKE_LIBR_CORE_LIBRARY=usr/lib64/R/lib/libR.so -DRSTUDIO_USE_SYSTEM_BOOST=Yes ..
- cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server -DRSTUDIO_USE_SYSTEM_BOOST=yes ..
+ cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server -DRSTUDIO_USE_SYSTEM_BOOST=yes -DBoost_NO_BOOST_CMAKE=ON ..
}