summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2011-06-02 09:52:49 +0000
committerHans de Graaff <graaff@gentoo.org>2011-06-02 09:52:49 +0000
commitefa5f8bdf5606b8ccb5bd7c0a2ece1d3ebe060f6 (patch)
tree125d6a4a453d1b0789e42ad4d832611748c46646 /dev-ruby
parentversion bump for bug 368721 (diff)
downloadgentoo-2-efa5f8bdf5606b8ccb5bd7c0a2ece1d3ebe060f6.tar.gz
gentoo-2-efa5f8bdf5606b8ccb5bd7c0a2ece1d3ebe060f6.tar.bz2
gentoo-2-efa5f8bdf5606b8ccb5bd7c0a2ece1d3ebe060f6.zip
Don't use -Werror during compilation. Fixes bug 369639.
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/gherkin/ChangeLog6
-rw-r--r--dev-ruby/gherkin/files/gherkin-2.3.10-no-werror.patch22
-rw-r--r--dev-ruby/gherkin/gherkin-2.3.10.ebuild4
3 files changed, 30 insertions, 2 deletions
diff --git a/dev-ruby/gherkin/ChangeLog b/dev-ruby/gherkin/ChangeLog
index 12bf48c01851..224aa6732e83 100644
--- a/dev-ruby/gherkin/ChangeLog
+++ b/dev-ruby/gherkin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/gherkin
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.21 2011/06/02 07:18:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.22 2011/06/02 09:52:49 graaff Exp $
+
+ 02 Jun 2011; Hans de Graaff <graaff@gentoo.org> gherkin-2.3.10.ebuild,
+ +files/gherkin-2.3.10-no-werror.patch:
+ Don't use -Werror during compilation. Fixes bug 369639.
*gherkin-2.3.10 (02 Jun 2011)
diff --git a/dev-ruby/gherkin/files/gherkin-2.3.10-no-werror.patch b/dev-ruby/gherkin/files/gherkin-2.3.10-no-werror.patch
new file mode 100644
index 000000000000..644a46a388d7
--- /dev/null
+++ b/dev-ruby/gherkin/files/gherkin-2.3.10-no-werror.patch
@@ -0,0 +1,22 @@
+commit 1a46a428b4c92982124a8081623db9d56f6a28d7
+Author: Hans de Graaff <hans@degraaff.org>
+Date: Thu Jun 2 11:46:22 2011 +0200
+
+ Don't use -Werror in production code.
+
+ Using -Werror will break compilation when new versions of gcc are
+ introduced since new warnings are added for every new version.
+
+diff --git a/tasks/compile.rake b/tasks/compile.rake
+index 57cd90f..01e9b55 100755
+--- a/tasks/compile.rake
++++ b/tasks/compile.rake
+@@ -72,7 +72,7 @@ langs.each do |i18n|
+ io.write(<<-EOF)
+ require 'mkmf'
+ CONFIG['warnflags'].gsub!(/-Wshorten-64-to-32/, '') if CONFIG['warnflags']
+-$CFLAGS << ' -O0 -Wall -Werror' if CONFIG['CC'] =~ /gcc/
++$CFLAGS << ' -O0 -Wall' if CONFIG['CC'] =~ /gcc/
+ dir_config("gherkin_lexer_#{i18n.underscored_iso_code}")
+ have_library("c", "main")
+ create_makefile("gherkin_lexer_#{i18n.underscored_iso_code}")
diff --git a/dev-ruby/gherkin/gherkin-2.3.10.ebuild b/dev-ruby/gherkin/gherkin-2.3.10.ebuild
index c642a6ea08f6..a5353354163a 100644
--- a/dev-ruby/gherkin/gherkin-2.3.10.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.3.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.3.10.ebuild,v 1.1 2011/06/02 07:18:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.3.10.ebuild,v 1.2 2011/06/02 09:52:49 graaff Exp $
EAPI=2
USE_RUBY="ruby18 ree18"
@@ -40,6 +40,8 @@ ruby_add_bdepend "
ruby_add_rdepend ">=dev-ruby/json-1.4.6"
all_ruby_prepare() {
+ epatch "${FILESDIR}/${P}-no-werror.patch"
+
# Remove Bundler-related things.
sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb features/support/env.rb || die
rm Gemfile || die