user/gitlab-foss: use ruby 3.0
This commit is contained in:
parent
a24b564661
commit
45a11233fd
1 changed files with 16 additions and 13 deletions
|
@ -5,7 +5,7 @@ pkgname=gitlab-foss
|
|||
_pkgname=${pkgname%-foss}
|
||||
pkgver=15.9.3
|
||||
_gittag=v$pkgver
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="A version control for your server"
|
||||
url="https://gitlab.com/gitlab-org/gitlab-foss"
|
||||
arch="x86_64"
|
||||
|
@ -25,15 +25,15 @@ depends="
|
|||
py-docutils
|
||||
python3
|
||||
redis>=2.8
|
||||
ruby
|
||||
ruby-bigdecimal
|
||||
ruby-bundler
|
||||
ruby-fiddle
|
||||
ruby-io-console
|
||||
ruby-irb
|
||||
ruby-json
|
||||
ruby-rake
|
||||
ruby-webrick
|
||||
ruby3.0
|
||||
ruby3.0-bigdecimal
|
||||
ruby3.0-bundler
|
||||
ruby3.0-fiddle
|
||||
ruby3.0-io-console
|
||||
ruby3.0-irb
|
||||
ruby3.0-json
|
||||
ruby3.0-rake
|
||||
ruby3.0-webrick
|
||||
shared-mime-info
|
||||
tzdata
|
||||
"
|
||||
|
@ -54,9 +54,9 @@ makedepends="
|
|||
openssl-dev
|
||||
protobuf-dev
|
||||
re2-dev
|
||||
ruby-dev
|
||||
ruby-grpc=~1.42.0
|
||||
ruby-rugged=~1.5.0.1
|
||||
ruby3.0-dev
|
||||
ruby3.0-grpc=~1.42.0
|
||||
ruby3.0-rugged=~1.5.0.1
|
||||
yarn>=1.2.0
|
||||
"
|
||||
pkgusers="git"
|
||||
|
@ -144,6 +144,9 @@ build() {
|
|||
# Remove faulty RPATH.
|
||||
chrpath -d vendor/bundle/ruby/*/extensions/*/*/ruby-magic-*/magic/magic.so
|
||||
|
||||
# cp grpc lib
|
||||
cp vendor/gems/grpc/src/ruby/lib/grpc/grpc_c.so vendor/bundle/ruby/*/gems/grpc-*/src/ruby/lib/grpc/grpc_c.so
|
||||
|
||||
# Patch installed gem gitlab-markup to use python3.
|
||||
# Option "-S" causes that Python cannot find docutils module.
|
||||
sed -i 's/python2 -S/python3/g' \
|
||||
|
|
Loading…
Reference in a new issue