1 |
commit: 82b1c42abeded95e19e1e234770ae41f46591c15 |
2 |
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in> |
3 |
AuthorDate: Mon May 3 17:33:58 2021 +0000 |
4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
5 |
CommitDate: Mon May 3 17:35:14 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82b1c42a |
7 |
|
8 |
www-servers/thin: fix failing tests and flags |
9 |
|
10 |
Closes: https://bugs.gentoo.org/787827 |
11 |
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in> |
12 |
|
13 |
www-servers/thin/thin-1.8.0.ebuild | 18 ++++++++++-------- |
14 |
1 file changed, 10 insertions(+), 8 deletions(-) |
15 |
|
16 |
diff --git a/www-servers/thin/thin-1.8.0.ebuild b/www-servers/thin/thin-1.8.0.ebuild |
17 |
index 3ea7476f7..9f43ab603 100644 |
18 |
--- a/www-servers/thin/thin-1.8.0.ebuild |
19 |
+++ b/www-servers/thin/thin-1.8.0.ebuild |
20 |
@@ -5,6 +5,10 @@ EAPI=7 |
21 |
|
22 |
USE_RUBY="ruby24 ruby25 ruby26" |
23 |
|
24 |
+RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
25 |
+ |
26 |
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" |
27 |
+ |
28 |
inherit ruby-fakegem |
29 |
|
30 |
DESCRIPTION="This a Ruby gem that delivers a thin and fast web server" |
31 |
@@ -22,8 +26,6 @@ ruby_add_depend " |
32 |
dev-ruby/rack |
33 |
" |
34 |
|
35 |
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" |
36 |
- |
37 |
all_ruby_prepare() { |
38 |
# Fix Ragel-based parser generation (uses a *very* old syntax that |
39 |
# is not supported in Gentoo) |
40 |
@@ -49,8 +51,8 @@ all_ruby_prepare() { |
41 |
-e '/tracing routines (with NO custom logger)/,/^ end/ s:^:#:'\ |
42 |
spec/logging_spec.rb || die |
43 |
|
44 |
- find spec/perf -name "*_spec.rb" -exec \ |
45 |
- sed -i '/be_faster_then/ i \ pending' {} \; |
46 |
+ # Remove failing perfomance tests |
47 |
+ rm -r spec/perf || die |
48 |
|
49 |
sed -i -e "s/Spec::Runner/Rspec/" spec/spec_helper.rb || die |
50 |
# nasty but too complex to fix up for now :( |
51 |
@@ -58,16 +60,16 @@ all_ruby_prepare() { |
52 |
} |
53 |
|
54 |
each_ruby_configure() { |
55 |
- ${RUBY} -Cext/thin_parser extconf.rb || die |
56 |
+ ${RUBY} -Cext/thin_parser extconf.rb || die |
57 |
} |
58 |
|
59 |
each_ruby_compile() { |
60 |
- emake V=1 -Cext/thin_parser |
61 |
- cp ext/thin_parser/thin_parser.so lib/ || die |
62 |
+ emake V=1 CFLAGS="${CFLAGS} -fPIC" DLDFLAGS="${LDFLAGS}" -Cext/thin_parser |
63 |
+ cp ext/thin_parser/thin_parser.so lib/ || die |
64 |
} |
65 |
|
66 |
all_ruby_install() { |
67 |
- ruby_fakegem_binwrapper thin |
68 |
+ ruby_fakegem_binwrapper thin |
69 |
} |
70 |
|
71 |
all_ruby_install() { |