| 1 |
commit: bf8936159b56276eb0444560fcd776f13b17db98 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 1 11:38:12 2018 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 1 11:39:35 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf893615 |
| 7 |
|
| 8 |
dev-ruby/charlock_holmes: Always build in C++11 mode |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/653398 |
| 11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-ruby/charlock_holmes/charlock_holmes-0.7.6.ebuild | 4 +++- |
| 15 |
.../files/charlock_holmes-0.7.6-gcc5.patch | 16 ++++++++++++++++ |
| 16 |
2 files changed, 19 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/dev-ruby/charlock_holmes/charlock_holmes-0.7.6.ebuild b/dev-ruby/charlock_holmes/charlock_holmes-0.7.6.ebuild |
| 19 |
index b9bbacc1a91..47c7658b1bd 100644 |
| 20 |
--- a/dev-ruby/charlock_holmes/charlock_holmes-0.7.6.ebuild |
| 21 |
+++ b/dev-ruby/charlock_holmes/charlock_holmes-0.7.6.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Foundation |
| 24 |
+# Copyright 1999-2018 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
@@ -26,6 +26,8 @@ CDEPEND="dev-libs/icu:= |
| 29 |
DEPEND+=" ${CDEPEND}" |
| 30 |
RDEPEND+=" ${CDEPEND}" |
| 31 |
|
| 32 |
+PATCHES=( "${FILESDIR}"/${PN}-0.7.6-gcc5.patch ) |
| 33 |
+ |
| 34 |
all_ruby_prepare() { |
| 35 |
sed -i -e '/bundler/d' test/helper.rb || die |
| 36 |
|
| 37 |
|
| 38 |
diff --git a/dev-ruby/charlock_holmes/files/charlock_holmes-0.7.6-gcc5.patch b/dev-ruby/charlock_holmes/files/charlock_holmes-0.7.6-gcc5.patch |
| 39 |
new file mode 100644 |
| 40 |
index 00000000000..944efac1925 |
| 41 |
--- /dev/null |
| 42 |
+++ b/dev-ruby/charlock_holmes/files/charlock_holmes-0.7.6-gcc5.patch |
| 43 |
@@ -0,0 +1,16 @@ |
| 44 |
+--- a/ext/charlock_holmes/extconf.rb |
| 45 |
++++ b/ext/charlock_holmes/extconf.rb |
| 46 |
+@@ -54,11 +54,8 @@ |
| 47 |
+ have_library 'icuuc' or abort 'libicuuc missing' |
| 48 |
+ have_library 'icudata' or abort 'libicudata missing' |
| 49 |
+ |
| 50 |
+-# icu4c might be built in C++11 mode, but it also might not have been |
| 51 |
+-icuconfig = `which icu-config`.chomp if icuconfig.empty? |
| 52 |
+-if File.exist?(icuconfig) && `#{icuconfig} --cxxflags`.include?("c++11") |
| 53 |
+- $CXXFLAGS << ' -std=c++11' |
| 54 |
+-end |
| 55 |
++# Always use C++11 |
| 56 |
++$CXXFLAGS << ' -std=c++11' |
| 57 |
+ |
| 58 |
+ $CFLAGS << ' -Wall -funroll-loops' |
| 59 |
+ $CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG'] |
Archives