| 1 |
commit: df3e5740fbee1de313a9ee8942e5b5bcc67080b0 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 29 01:51:45 2016 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 29 01:52:01 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df3e5740 |
| 7 |
|
| 8 |
dev-ruby/facter: fixing build issue for bug 600942 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
dev-ruby/facter/facter-3.5.0.ebuild | 2 ++ |
| 13 |
.../facter/files/facter-3.5.0-collection-fix.patch | 24 ++++++++++++++++++++++ |
| 14 |
2 files changed, 26 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-ruby/facter/facter-3.5.0.ebuild b/dev-ruby/facter/facter-3.5.0.ebuild |
| 17 |
index c90ae7c..693d798 100644 |
| 18 |
--- a/dev-ruby/facter/facter-3.5.0.ebuild |
| 19 |
+++ b/dev-ruby/facter/facter-3.5.0.ebuild |
| 20 |
@@ -39,6 +39,8 @@ src_prepare() { |
| 21 |
# make it support multilib |
| 22 |
sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die |
| 23 |
sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die |
| 24 |
+ # patches |
| 25 |
+ epatch "${FILESDIR}/facter-3.5.0-collection-fix.patch" |
| 26 |
} |
| 27 |
|
| 28 |
src_configure() { |
| 29 |
|
| 30 |
diff --git a/dev-ruby/facter/files/facter-3.5.0-collection-fix.patch b/dev-ruby/facter/files/facter-3.5.0-collection-fix.patch |
| 31 |
new file mode 100644 |
| 32 |
index 00000000..edd10d2 |
| 33 |
--- /dev/null |
| 34 |
+++ b/dev-ruby/facter/files/facter-3.5.0-collection-fix.patch |
| 35 |
@@ -0,0 +1,24 @@ |
| 36 |
+diff -Naur /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0.old/lib/inc/facter/facts/collection.hpp /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0/lib/inc/facter/facts/collection.hpp |
| 37 |
+--- facter-3.5.0.old/lib/inc/facter/facts/collection.hpp 2016-10-21 18:32:16.000000000 -0500 |
| 38 |
++++ facter-3.5.0/lib/inc/facter/facts/collection.hpp 2016-11-28 19:36:55.025454011 -0600 |
| 39 |
+@@ -94,7 +94,7 @@ |
| 40 |
+ * for the facts they resolve |
| 41 |
+ */ |
| 42 |
+ collection(std::set<std::string> const& blocklist = std::set<std::string>(), |
| 43 |
+- std::unordered_map<std::string, int64_t> const& ttls = {}); |
| 44 |
++ std::unordered_map<std::string, int64_t> const& ttls = std::unordered_map<std::string, int64_t>{}); |
| 45 |
+ |
| 46 |
+ /** |
| 47 |
+ * Destructor for fact collection. |
| 48 |
+diff -Naur /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0.old/lib/tests/collection_fixture.hpp /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0/lib/tests/collection_fixture.hpp |
| 49 |
+--- facter-3.5.0.old/lib/tests/collection_fixture.hpp 2016-10-21 18:32:16.000000000 -0500 |
| 50 |
++++ facter-3.5.0/lib/tests/collection_fixture.hpp 2016-11-28 19:36:47.322311122 -0600 |
| 51 |
+@@ -10,7 +10,7 @@ |
| 52 |
+ { |
| 53 |
+ public: |
| 54 |
+ collection_fixture(std::set<std::string> const& blocklist = std::set<std::string>(), |
| 55 |
+- std::unordered_map<std::string, int64_t> const& ttls = {}); |
| 56 |
++ std::unordered_map<std::string, int64_t> const& ttls = std::unordered_map<std::string, int64_t>{}); |
| 57 |
+ |
| 58 |
+ protected: |
| 59 |
+ virtual std::vector<std::string> get_external_fact_directories() const override; |
Archives