From 71ffb6be137465ce9d49f95f8444d8ea434d1bf8 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Mon, 17 Dec 2018 03:00:43 +0100 Subject: [PATCH] dev-db/mariadb-connector-c: fix pkg-config file install location Closes: https://bugs.gentoo.org/673218 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann --- ...iadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch} | 11 +++++++++++ ...0.7.ebuild => mariadb-connector-c-3.0.7-r1.ebuild} | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) rename dev-db/mariadb-connector-c/files/{mariadb-connector-c-3.0.7-fix-pkconfig-file.patch => mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch} (63%) rename dev-db/mariadb-connector-c/{mariadb-connector-c-3.0.7.ebuild => mariadb-connector-c-3.0.7-r1.ebuild} (98%) diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch similarity index 63% rename from dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch rename to dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch index 1a16a2c01015..1fe06e2c8e5e 100644 --- a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch +++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch @@ -1,3 +1,14 @@ +https://bugs.gentoo.org/673218 + +--- a/mariadb_config/CMakeLists.txt ++++ b/mariadb_config/CMakeLists.txt +@@ -59,5 +59,5 @@ INSTALL(TARGETS mariadb_config + COMPONENT Development) + + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc +- DESTINATION "lib/pkgconfig" ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + COMPONENT Development) --- a/mariadb_config/libmariadb.pc.in +++ b/mariadb_config/libmariadb.pc.in @@ -7,13 +7,12 @@ diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild similarity index 98% rename from dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7.ebuild rename to dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild index b6cc03960bed..8622a1ea73c0 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild @@ -55,7 +55,7 @@ RDEPEND="${DEPEND} " PATCHES=( "${FILESDIR}"/gentoo-layout-3.0.patch - "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file.patch + "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file-r1.patch ) src_configure() { -- 2.26.2