commit: e570c57be2d795f816a494ea41a3046d013a80f1 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Oct 15 15:57:33 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Oct 15 15:58:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e570c57b
dev-db/mariadb-connector-c: install pkconfig file Closes: https://bugs.gentoo.org/668664 Package-Manager: Portage-2.3.50, Repoman-2.3.11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> ...b-connector-c-3.0.6-provide-pkconfig-file.patch | 48 ++++++++++++++++++++++ ....ebuild => mariadb-connector-c-3.0.6-r1.ebuild} | 6 ++- .../mariadb-connector-c-9999.ebuild | 6 ++- 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch new file mode 100644 index 00000000000..02bbefce357 --- /dev/null +++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch @@ -0,0 +1,48 @@ +--- a/mariadb_config/CMakeLists.txt ++++ b/mariadb_config/CMakeLists.txt +@@ -46,6 +46,8 @@ ENDIF() + + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in + ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c @ONLY) ++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmariadb.pc.in ++ ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc @ONLY) + + ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c) + +@@ -54,3 +56,6 @@ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c) + INSTALL(TARGETS mariadb_config + DESTINATION "bin" + COMPONENT Development) ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ++ COMPONENT Development) +--- a/mariadb_config/libmariadb.pc.in ++++ b/mariadb_config/libmariadb.pc.in +@@ -1,19 +1,11 @@ +-# +-# pkg_config.pc.in +-# +-# pkg_config configuration file +-# For a detailed description of options, please visit +-# Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) +-# +- +-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ +-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ +-prefix=@PREFIX_INSTALL_DIR@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=${prefix}/include + + Name: libmariadb +-Version: @LIBMARIADB_VERSION@ + Description: MariaDB Connector/C dynamic library +-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@ +-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ +- +- ++Version: @LIBMARIADB_VERSION@ ++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/ ++Libs: -L${libdir} -lmariadb ++Cflags: -I${includedir}/mariadb diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild similarity index 95% rename from dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild rename to dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild index df11d552495..330c1ac6ef2 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -55,7 +55,9 @@ RDEPEND="${DEPEND} !>=dev-db/mariadb-10.2.0[client-libs(+)] " PATCHES=( - "${FILESDIR%/}/gentoo-layout-3.0.patch" ) + "${FILESDIR}"/gentoo-layout-3.0.patch + "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch +) src_configure() { # bug 508724 mariadb cannot use ld.gold diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild index df11d552495..330c1ac6ef2 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -55,7 +55,9 @@ RDEPEND="${DEPEND} !>=dev-db/mariadb-10.2.0[client-libs(+)] " PATCHES=( - "${FILESDIR%/}/gentoo-layout-3.0.patch" ) + "${FILESDIR}"/gentoo-layout-3.0.patch + "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch +) src_configure() { # bug 508724 mariadb cannot use ld.gold
