diff options
author | Stephen Martin | 2018-05-25 15:14:30 -0500 |
---|---|---|
committer | Stephen Martin | 2018-05-25 15:14:30 -0500 |
commit | 170e2ad2d9d7ac74119a32266df1a9aabfd85a99 (patch) | |
tree | 004a705812a7428693712abb849f4e43c6d0b3b7 | |
parent | 7e19a11fddf003d2295a88e264aaa3b2bcd872c9 (diff) | |
download | aur-170e2ad2d9d7ac74119a32266df1a9aabfd85a99.tar.gz |
Fixed node issue; fix provided by ConorIA
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | PKGBUILD | 38 |
2 files changed, 24 insertions, 23 deletions
@@ -1,9 +1,10 @@ # Generated by mksrcinfo v8 -# Sat Mar 24 05:12:05 UTC 2018 +# Fri May 25 20:13:53 UTC 2018 pkgbase = shiny-server-git pkgdesc = Open-source version of the shiny web development framework server - pkgver = 20160223 + pkgver = 1.5.6.875.r37.g66e45ab pkgrel = 1 + epoch = 1 url = http://www.rstudio.com/shiny/server/install-opensource install = accounts.install arch = i686 @@ -18,8 +19,8 @@ pkgbase = shiny-server-git backup = etc/shiny-server/shiny-server.conf source = shiny-server::git+https://github.com/rstudio/shiny-server.git source = shiny-server.service - md5sums = SKIP - md5sums = 78811ea3ebc75bf875e13e202e4587ae + sha256sums = SKIP + sha256sums = 8486c5e5d2c8362daf2c6826ea702e3f49dd6ee64c30ca79bdf2f4edbe0d2744 pkgname = shiny-server-git @@ -1,24 +1,28 @@ # Maintainer: Stephen Martin <stephensrmmartin at gmail dot com> pkgname=shiny-server-git -pkgver=20160223 +pkgver=1.5.6.875.r37.g66e45ab pkgrel=1 +epoch=1 pkgdesc="Open-source version of the shiny web development framework server" arch=('i686' 'x86_64') url="http://www.rstudio.com/shiny/server/install-opensource" license=('AGPL') depends=('r') makedepends=('git' 'python2' 'cmake' 'r' 'gcc6') -install='accounts.install' backup=('etc/shiny-server/shiny-server.conf') -source=('shiny-server::git+https://github.com/rstudio/shiny-server.git' +install='accounts.install' +source=('shiny-server::git+https://github.com/rstudio/shiny-server.git' 'shiny-server.service') -pkver(){ - cd "$srcdir/$pkgname" - git describe --long|sed -E 's/([^-]*-g)/r\1/;s/-/./g' -} - +sha256sums=('SKIP' + '8486c5e5d2c8362daf2c6826ea702e3f49dd6ee64c30ca79bdf2f4edbe0d2744') _gitroot=https://github.com/rstudio/shiny-server.git _gitname=shiny-server + +pkgver(){ + cd "$srcdir/$_gitname" + git describe --tags --long | sed -E 's/v//;s/([^-]*-g)/r\1/;s/-/./g' +} + prepare(){ # Vigorously force the use of python2 cd $srcdir @@ -28,31 +32,31 @@ prepare(){ -e 's_^#!/usr/bin/python$_&2_' \ -e "s_'python'_'python2'_" -i {} \; } - + build() { cd "$srcdir/$_gitname" mkdir tmp cd tmp # More python2 hackery - DIR=`pwd` - PATH=$DIR/../bin/:$PATH + PATH=$PWD/../bin/:$PATH ln -s `which python2` ../bin/python export _PYTHON=`which python2` export PYTHON=`which python2` - + # Node fails with gcc7 export CC=/bin/gcc-6 export CXX=/bin/g++-6 - + # CMake cmake -DCMAKE_INSTALL_PREFIX=/usr -DPYTHON="$_PYTHON" ../ make - + mkdir ../build + (cd .. && external/node/install-node.sh) (cd .. && bin/npm --python="$PYTHON" install) (cd .. && bin/node ext/node/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js --python="$PYTHON" rebuild) } - + package() { cd "$srcdir/$_gitname/tmp" make DESTDIR="$pkgdir/" install @@ -62,7 +66,3 @@ package() { install -m 644 -D $srcdir/shiny-server.service $pkgdir/usr/lib/systemd/system/shiny-server.service install -m 644 -D $srcdir/$_gitname/config/default.config $pkgdir/etc/shiny-server/shiny-server.conf } - -# vim:set ts=2 sw=2 et: -md5sums=('SKIP' - '78811ea3ebc75bf875e13e202e4587ae') |