diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-10-15 17:57:33 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-10-15 17:58:17 +0200 |
| commit | e570c57be2d795f816a494ea41a3046d013a80f1 (patch) | |
| tree | 13c795bc033c6e92bd6a28d0587a1bdf4da8f0a2 /dev-db | |
| parent | app-text/mupdf: fix shared library build (diff) | |
| download | gentoo-e570c57be2d795f816a494ea41a3046d013a80f1.tar.gz gentoo-e570c57be2d795f816a494ea41a3046d013a80f1.tar.bz2 gentoo-e570c57be2d795f816a494ea41a3046d013a80f1.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch | 48 | ||||
| -rw-r--r-- | dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild (renamed from dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild) | 6 | ||||
| -rw-r--r-- | dev-db/mariadb-connector-c/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 000000000000..02bbefce3576 --- /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 index df11d5524952..330c1ac6ef21 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 df11d5524952..330c1ac6ef21 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 |