diff options
| -rw-r--r-- | dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-pkg-config.patch | 21 | ||||
| -rw-r--r-- | dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild (renamed from dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild) | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-pkg-config.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-pkg-config.patch new file mode 100644 index 000000000000..3e7bc7bae937 --- /dev/null +++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-pkg-config.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/807745 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,13 +148,13 @@ if (YAML_CPP_INSTALL) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.h") + install(EXPORT yaml-cpp-targets +- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") + install(FILES + "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" + "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") + install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" +- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + + if(YAML_CPP_BUILD_TESTS) diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild index c35d82cd5f21..dec50f0fe463 100644 --- a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild +++ b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild @@ -21,6 +21,7 @@ DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )" PATCHES=( "${FILESDIR}/${P}-gtest.patch" + "${FILESDIR}/${P}-pkg-config.patch" ) src_prepare() { |