diff options
| author | Stephen Martin | 2019-10-07 14:00:57 -0700 |
|---|---|---|
| committer | Stephen Martin | 2019-10-07 14:00:57 -0700 |
| commit | a7b598a296f077e4ce5bd813f6fa9f0b5bc62742 (patch) | |
| tree | 76a22b9ed31ef1f887f3770fe5eda361aa5754af | |
| parent | d8de2103e2f68430ed1675bbad1377e268e6e6b7 (diff) | |
| download | aur-a7b598a296f077e4ce5bd813f6fa9f0b5bc62742.tar.gz | |
Boost fix
- Boost > 1.69 works
- Boost >= 1.7 includes a CMAKE interface
- Rstudio does not yet support this.
- Disabled the CMAKE interface.
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 7 |
2 files changed, 7 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = rstudio-desktop-git pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language - pkgver = 1.2.5001.r1358 + pkgver = 1.2.5001.r1361 pkgrel = 1 url = https://www.rstudio.com/products/rstudio/ arch = i686 @@ -8,7 +8,7 @@ pkgbase = rstudio-desktop-git license = AGPL3 makedepends = git makedepends = cmake>=3.1.0 - makedepends = boost1.69 + makedepends = boost makedepends = desktop-file-utils makedepends = jdk8-openjdk makedepends = apache-ant @@ -18,7 +18,7 @@ pkgbase = rstudio-desktop-git makedepends = pam makedepends = patchelf makedepends = wget - depends = boost1.69-libs + depends = boost-libs depends = r>=2.11.1 depends = hunspell-en_US depends = mathjax @@ -3,7 +3,7 @@ pkgname=rstudio-desktop-git _gitname=rstudio -pkgver=1.2.5001.r1358 +pkgver=1.2.5001.r1361 _gwtver=2.8.2 _ginver=2.1.2 pkgrel=1 @@ -11,8 +11,8 @@ pkgdesc="A powerful and productive integrated development environment (IDE) for arch=('i686' 'x86_64') url="https://www.rstudio.com/products/rstudio/" license=('AGPL3') -depends=('boost1.69-libs' 'r>=2.11.1' hunspell-en_US mathjax pandoc clang qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns) -makedepends=(git 'cmake>=3.1.0' 'boost1.69' desktop-file-utils jdk8-openjdk apache-ant unzip openssl libcups pam patchelf wget) +depends=('boost-libs' 'r>=2.11.1' hunspell-en_US mathjax pandoc clang qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns) +makedepends=(git 'cmake>=3.1.0' 'boost' desktop-file-utils jdk8-openjdk apache-ant unzip openssl libcups pam patchelf wget) optdepends=('git: for git support' 'subversion: for subversion support' 'openssh-askpass: for a git ssh access') @@ -62,6 +62,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio \ -DRSTUDIO_USE_SYSTEM_BOOST=yes \ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ + -DBoost_NO_BOOST_CMAKE=ON \ -DRSTUDIO_BUNDLE_QT=FALSE .. } |