user/gitlab-foss: use ruby-rugged aport
This commit is contained in:
parent
7afb21f089
commit
557509bad0
1 changed files with 13 additions and 14 deletions
|
@ -5,7 +5,7 @@ pkgname=gitlab-foss
|
||||||
_pkgname=${pkgname%-foss}
|
_pkgname=${pkgname%-foss}
|
||||||
pkgver=15.9.2
|
pkgver=15.9.2
|
||||||
_gittag=v$pkgver
|
_gittag=v$pkgver
|
||||||
pkgrel=3
|
pkgrel=4
|
||||||
pkgdesc="A version control for your server"
|
pkgdesc="A version control for your server"
|
||||||
url="https://gitlab.com/gitlab-org/gitlab-foss"
|
url="https://gitlab.com/gitlab-org/gitlab-foss"
|
||||||
arch="x86_64"
|
arch="x86_64"
|
||||||
|
@ -46,7 +46,6 @@ makedepends="
|
||||||
icu-dev
|
icu-dev
|
||||||
libffi-dev
|
libffi-dev
|
||||||
libgcrypt-dev
|
libgcrypt-dev
|
||||||
libgit2-dev
|
|
||||||
libpq-dev
|
libpq-dev
|
||||||
libxml2-dev
|
libxml2-dev
|
||||||
libxslt-dev
|
libxslt-dev
|
||||||
|
@ -56,7 +55,8 @@ makedepends="
|
||||||
protobuf-dev
|
protobuf-dev
|
||||||
re2-dev
|
re2-dev
|
||||||
ruby-dev
|
ruby-dev
|
||||||
ruby-grpc
|
ruby-grpc=~1.42.0
|
||||||
|
ruby-rugged=~1.5.0.1
|
||||||
yarn>=1.2.0
|
yarn>=1.2.0
|
||||||
"
|
"
|
||||||
pkgusers="git"
|
pkgusers="git"
|
||||||
|
@ -100,14 +100,16 @@ prepare() {
|
||||||
# Remove all locale files except en.
|
# Remove all locale files except en.
|
||||||
find locale -type d -mindepth 1 ! -name en -exec rm -rf {} +
|
find locale -type d -mindepth 1 ! -name en -exec rm -rf {} +
|
||||||
|
|
||||||
# This Google gem is totally messed, so we can't install it from
|
# Some gems are broken, so we copy our fixed version
|
||||||
# RubyGems using Bundler.
|
# instead of installing it from RubyGems using Bundler.
|
||||||
mkdir -p vendor/gems/grpc
|
for i in grpc rugged; do
|
||||||
cp -r "$sysgemdir"/gems/grpc-*/* vendor/gems/grpc/
|
mkdir -p vendor/gems/$i/src/ruby/lib/$i
|
||||||
cp "$sysgemdir"/specifications/grpc-*.gemspec \
|
cp -r "$sysgemdir"/gems/$i-*/* vendor/gems/$i/
|
||||||
vendor/gems/grpc/grpc.gemspec
|
cp "$sysgemdir"/specifications/$i-*.gemspec \
|
||||||
cp "$sysgemdir"/extensions/*/*/grpc-*/grpc/*.so \
|
vendor/gems/$i/$i.gemspec
|
||||||
vendor/gems/grpc/src/ruby/lib/grpc/
|
cp "$sysgemdir"/extensions/*/*/$i-*/$i/*.so \
|
||||||
|
vendor/gems/$i/src/ruby/lib/$i/
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
@ -127,9 +129,6 @@ build() {
|
||||||
--with-xml2-include=/usr/include/libxml2 \
|
--with-xml2-include=/usr/include/libxml2 \
|
||||||
--with-xslt-include=/usr/include/libxslt
|
--with-xslt-include=/usr/include/libxslt
|
||||||
bundle config --local build.ruby-magic --enable-system-libraries
|
bundle config --local build.ruby-magic --enable-system-libraries
|
||||||
# compatibility with libgit 1.5.1 has issues
|
|
||||||
# bundle config --local build.rugged --use-system-libraries
|
|
||||||
# https://github.com/protocolbuffers/protobuf/issues/2335#issuecomment-579913357
|
|
||||||
bundle config --local build.google-protobuf --with-cflags=-D__va_copy=va_copy
|
bundle config --local build.google-protobuf --with-cflags=-D__va_copy=va_copy
|
||||||
bundle config --local path "vendor/bundle"
|
bundle config --local path "vendor/bundle"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue