aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2021-01-09 16:29:32 +0100
committerJakub Jirutka <jakub@jirutka.cz>2021-01-09 16:30:38 +0100
commit91b2ed170281bb87562ae67fc600748ce5bd9a6c (patch)
tree5ab646af02417063abf6ea8ced1fab1881f45b62
parentff169fcdafd9cbc4dd34ad450870ced57dfb36c8 (diff)
downloadaports-91b2ed170281bb87562ae67fc600748ce5bd9a6c.tar.gz
aports-91b2ed170281bb87562ae67fc600748ce5bd9a6c.tar.bz2
aports-91b2ed170281bb87562ae67fc600748ce5bd9a6c.tar.xz
community/ruby-concurrent-ruby: build on all arches, except -java subpkg
-rw-r--r--community/ruby-concurrent-ruby/APKBUILD23
-rw-r--r--community/ruby-concurrent-ruby/gemspecs.patch (renamed from community/ruby-concurrent-ruby/ungit-gemspec.patch)14
2 files changed, 22 insertions, 15 deletions
diff --git a/community/ruby-concurrent-ruby/APKBUILD b/community/ruby-concurrent-ruby/APKBUILD
index f68e9c61b2..7eccb6f858 100644
--- a/community/ruby-concurrent-ruby/APKBUILD
+++ b/community/ruby-concurrent-ruby/APKBUILD
@@ -6,29 +6,28 @@ pkgver=1.1.6
pkgrel=1
pkgdesc="Modern concurrency tools for Ruby"
url="http://www.concurrent-ruby.com"
-# armhf, mips, mips64: requires 'jruby' and 'openjdk8'
-# x86, armv7, ppc64le: requires 'java-jffi-native'
-arch="all !mips !mips64 !x86 !armv7 !ppc64le !armhf"
+arch="all"
license="MIT"
depends="ruby ruby-etc"
-makedepends="jruby openjdk8 ruby-dev ruby-rake ruby-rake-compiler"
+makedepends="ruby-dev ruby-rake ruby-rake-compiler"
checkdepends="ruby-rspec ruby-timecop"
-subpackages="$pkgname-java::noarch $pkgname-ext"
+subpackages="$pkgname-ext"
source="$pkgname-$pkgver.tar.gz::https://github.com/ruby-concurrency/$_gemname/archive/v$pkgver.tar.gz
- ungit-gemspec.patch
+ gemspecs.patch
rakefile-remove-dock.patch
"
builddir="$srcdir/$_gemname-$pkgver"
-case "$CARCH" in
- # XXX: Two test fail, see https://github.com/ruby-concurrency/concurrent-ruby/issues/689
- armhf) options="!check";;
-esac
+# limited by jruby and openjdk8
+case "$CARCH" in x86_64 | aarch64)
+ makedepends="$makedepends jruby openjdk8"
+ subpackages="$subpackages $pkgname-java::noarch"
-build() {
export PATH="/usr/lib/jvm/java-1.8-openjdk/bin:$PATH"
export JRUBY_HOME="/usr/share/jruby"
+esac
+build() {
rake repackage
RUBYLIB="$(pwd)/lib" gem install --local \
@@ -95,5 +94,5 @@ ext() {
}
sha512sums="45b841761ab7060e437b334f8a1a6bcc60e230483cbf3176d6224020b6f7232fe61b0364a7ebe95b80e895847675a5ba0ae075bafcc35b709a60e288c32f2db3 ruby-concurrent-ruby-1.1.6.tar.gz
-4f464764072f8870a99c7b1ea263993f95e98edaf1c7f7ad350321ab74676d6511659eed779786d5dc9d31eae83c45651fc4a8895ea7082a7ebcf29398dd05d4 ungit-gemspec.patch
+2db9dbd791f52647c7ba66b6537575ccbaa402de0316169cfc887f8f25093f0507e144eca86a4f1baaefc9cd268474460ed1ea09713b5ffb354642c036bc46f0 gemspecs.patch
964384305dbe7d0578e80117587235acd2ab8e812aaa9353a13157ad92574b6db632fe96b144950e64377f94af26fa2ec1bad1c829493c48d379c0c91e1282b7 rakefile-remove-dock.patch"
diff --git a/community/ruby-concurrent-ruby/ungit-gemspec.patch b/community/ruby-concurrent-ruby/gemspecs.patch
index 28cf2edbf6..da4dea708a 100644
--- a/community/ruby-concurrent-ruby/ungit-gemspec.patch
+++ b/community/ruby-concurrent-ruby/gemspecs.patch
@@ -1,3 +1,6 @@
+Don't use git to filter files to be included.
+Include Java files only when JRUBY_HOME is set.
+
--- a/concurrent-ruby.gemspec
+++ b/concurrent-ruby.gemspec
@@ -2,8 +2,6 @@
@@ -9,17 +12,22 @@
s.name = 'concurrent-ruby'
s.version = Concurrent::VERSION
s.platform = Gem::Platform::RUBY
-@@ -13,8 +11,8 @@
+@@ -13,12 +11,12 @@
s.summary = 'Modern concurrency tools for Ruby. Inspired by Erlang, Clojure, Scala, Haskell, F#, C#, Java, and classic concurrency patterns.'
s.license = 'MIT'
s.date = Time.now.strftime('%Y-%m-%d')
- s.files = [*Dir['lib/concurrent-ruby/**/*.rb'] & git_files,
- *Dir['ext/concurrent-ruby/**/*'] & git_files,
+ s.files = [*Dir['lib/concurrent-ruby/**/*.rb'],
-+ *Dir['ext/concurrent-ruby/**/*'],
++ *(Dir['ext/concurrent-ruby/**/*'] if ENV['JRUBY_HOME']),
'Rakefile',
'Gemfile',
- 'lib/concurrent-ruby/concurrent/concurrent_ruby.jar'
+- 'lib/concurrent-ruby/concurrent/concurrent_ruby.jar'
++ ('lib/concurrent-ruby/concurrent/concurrent_ruby.jar' if ENV['JRUBY_HOME']),
+ ]
+ s.extra_rdoc_files = Dir['README*', 'LICENSE*', 'CHANGELOG*']
+ s.require_paths = ['lib/concurrent-ruby']
+ s.description = <<-TXT.gsub(/^ +/, '')
--- a/concurrent-ruby-edge.gemspec
+++ b/concurrent-ruby-edge.gemspec
@@ -2,8 +2,6 @@