summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Sokolov <alexey+gentoo@asokolov.org>2021-08-11 23:47:34 +0100
committerJoonas Niilola <juippis@gentoo.org>2021-08-16 09:58:26 +0300
commitc813626ffa5a15c38562bcb793e4a107a66fe95f (patch)
tree1b9eba0dca591711ae7e4b0c5021091882b07b9b /dev-cpp/yaml-cpp
parentmedia-gfx/solvespace: call xdg_mimeinfo_database_update on 3.0 (diff)
downloadgentoo-c813626ffa5a15c38562bcb793e4a107a66fe95f.tar.gz
gentoo-c813626ffa5a15c38562bcb793e4a107a66fe95f.tar.bz2
gentoo-c813626ffa5a15c38562bcb793e4a107a66fe95f.zip
dev-cpp/yaml-cpp: install cmake and .pc files to lib/
Closes: https://bugs.gentoo.org/807745 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/21953 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'dev-cpp/yaml-cpp')
-rw-r--r--dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-pkg-config.patch21
-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() {