diff options
| author |   David Seifert <soap@gentoo.org> | 2019-12-18 23:43:42 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2019-12-18 23:43:42 +0100 |
| commit | 45a6e82bee41452295212dd7217645c39fff35f3 (patch) | |
| tree | 1c90ccc9c36af36e866359d2506c6ee37288ced7 /dev-ruby/facter/files | |
| parent | dev-python/precis-i18n: Bump version and enable Python 3.7 and 3.8 (diff) | |
| download | gentoo-45a6e82bee41452295212dd7217645c39fff35f3.tar.gz gentoo-45a6e82bee41452295212dd7217645c39fff35f3.tar.bz2 gentoo-45a6e82bee41452295212dd7217645c39fff35f3.zip | |
dev-ruby/facter: Fix for shared dev-cpp/cpp-hocon
Closes: https://bugs.gentoo.org/703148
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-ruby/facter/files')
| -rw-r--r-- | dev-ruby/facter/files/facter-3.14.6-explicit-rspec-2.patch | 11 | ||||
| -rw-r--r-- | dev-ruby/facter/files/facter-3.14.6-fix-static-libcpp-hocon.patch | 9 |
2 files changed, 20 insertions, 0 deletions
diff --git a/dev-ruby/facter/files/facter-3.14.6-explicit-rspec-2.patch b/dev-ruby/facter/files/facter-3.14.6-explicit-rspec-2.patch new file mode 100644 index 000000000000..cd8f9f614d11 --- /dev/null +++ b/dev-ruby/facter/files/facter-3.14.6-explicit-rspec-2.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -205,7 +205,7 @@ + if (RUBY_FOUND) + find_program(BUNDLER_PATH NAMES bundle.bat bundle) + if (BUNDLER_PATH) +- add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib") ++ add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec-2 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib") + endif() + endif() + add_test(NAME "facter\\ smoke" COMMAND facter) diff --git a/dev-ruby/facter/files/facter-3.14.6-fix-static-libcpp-hocon.patch b/dev-ruby/facter/files/facter-3.14.6-fix-static-libcpp-hocon.patch new file mode 100644 index 000000000000..26c193c12b57 --- /dev/null +++ b/dev-ruby/facter/files/facter-3.14.6-fix-static-libcpp-hocon.patch @@ -0,0 +1,9 @@ +--- a/cmake/FindCPPHOCON.cmake ++++ b/cmake/FindCPPHOCON.cmake +@@ -1,5 +1,5 @@ + include(FindDependency) +-find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.a") ++find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.so") + + include(FeatureSummary) + set_package_properties(CPPHOCON PROPERTIES DESCRIPTION "A C++ parser for the HOCON configuration language" URL "https://github.com/puppetlabs/cpp-hocon") |