summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorStephen Martin2019-08-07 15:05:20 -0700
committerStephen Martin2019-08-07 15:05:20 -0700
commitd8624726b1c09cc3a1bd81a1165020d20caa64e3 (patch)
tree39fb42b2122e26e269ace2c4141e675c46640937 /PKGBUILD
parent706bee707596dc6e396eb1eca46993fb1980f9d9 (diff)
downloadaur-d8624726b1c09cc3a1bd81a1165020d20caa64e3.tar.gz
Removed boost-system.patch
- Rstudio team fixed this issue. - Now requires -DRSTUDIO_USE_SYSTEM_BOOST=yes in cmake call
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD9
1 files changed, 3 insertions, 6 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 2183f47a2f02..01534de16a5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
#
pkgname=rstudio-server-git
_gitname="rstudio"
-pkgver=v1.2.1330.r1174.g6830132b14
+pkgver=v1.2.1330.r1180.g655da0f077
_gwtver=2.8.2
_ginver=2.1.2
_clangver=3.8.0
@@ -25,13 +25,11 @@ source=('git://github.com/rstudio/rstudio.git'
'rstudio-server.service'
"https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip"
"https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip"
- "boost-system.patch"
)
md5sums=('SKIP'
'eea28f7865720f6c8d5de12f3f631880'
'e2617189fe5c138945b8cc95f26bd476'
- 'c295406d68c5ef364e445068599aa6d4'
- '135db966cb49800cf0f66c7f9ac063e7')
+ 'c295406d68c5ef364e445068599aa6d4')
pkgver() {
@@ -41,7 +39,6 @@ pkgver() {
prepare () {
cd ${srcdir}/$_gitname
- patch -p1 < $srcdir/boost-system.patch
msg "Extracting dependencies..."
cd "${srcdir}/${_gitname}/src/gwt"
@@ -80,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 ..
+ cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server -DRSTUDIO_USE_SYSTEM_BOOST=yes ..
}