diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2016-11-28 19:51:45 -0600 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2016-11-28 19:52:01 -0600 |
| commit | df3e5740fbee1de313a9ee8942e5b5bcc67080b0 (patch) | |
| tree | faeafadacd080d2d8612d10e4ea4a1fcabc60e3c /dev-ruby/facter | |
| parent | sys-cluster/nova: fixing python_install methods (diff) | |
| download | gentoo-df3e5740fbee1de313a9ee8942e5b5bcc67080b0.tar.gz gentoo-df3e5740fbee1de313a9ee8942e5b5bcc67080b0.tar.bz2 gentoo-df3e5740fbee1de313a9ee8942e5b5bcc67080b0.zip | |
dev-ruby/facter: fixing build issue for bug 600942
Package-Manager: portage-2.3.0
Diffstat (limited to 'dev-ruby/facter')
| -rw-r--r-- | dev-ruby/facter/facter-3.5.0.ebuild | 2 | ||||
| -rw-r--r-- | dev-ruby/facter/files/facter-3.5.0-collection-fix.patch | 24 |
2 files changed, 26 insertions, 0 deletions
diff --git a/dev-ruby/facter/facter-3.5.0.ebuild b/dev-ruby/facter/facter-3.5.0.ebuild index c90ae7c2cfb7..693d798df897 100644 --- a/dev-ruby/facter/facter-3.5.0.ebuild +++ b/dev-ruby/facter/facter-3.5.0.ebuild @@ -39,6 +39,8 @@ src_prepare() { # make it support multilib sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die + # patches + epatch "${FILESDIR}/facter-3.5.0-collection-fix.patch" } src_configure() { 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 new file mode 100644 index 000000000000..edd10d2b903e --- /dev/null +++ b/dev-ruby/facter/files/facter-3.5.0-collection-fix.patch @@ -0,0 +1,24 @@ +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 +--- facter-3.5.0.old/lib/inc/facter/facts/collection.hpp 2016-10-21 18:32:16.000000000 -0500 ++++ facter-3.5.0/lib/inc/facter/facts/collection.hpp 2016-11-28 19:36:55.025454011 -0600 +@@ -94,7 +94,7 @@ + * for the facts they resolve + */ + collection(std::set<std::string> const& blocklist = std::set<std::string>(), +- std::unordered_map<std::string, int64_t> const& ttls = {}); ++ std::unordered_map<std::string, int64_t> const& ttls = std::unordered_map<std::string, int64_t>{}); + + /** + * Destructor for fact collection. +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 +--- facter-3.5.0.old/lib/tests/collection_fixture.hpp 2016-10-21 18:32:16.000000000 -0500 ++++ facter-3.5.0/lib/tests/collection_fixture.hpp 2016-11-28 19:36:47.322311122 -0600 +@@ -10,7 +10,7 @@ + { + public: + collection_fixture(std::set<std::string> const& blocklist = std::set<std::string>(), +- std::unordered_map<std::string, int64_t> const& ttls = {}); ++ std::unordered_map<std::string, int64_t> const& ttls = std::unordered_map<std::string, int64_t>{}); + + protected: + virtual std::vector<std::string> get_external_fact_directories() const override; |