| 1 |
commit: e570c57be2d795f816a494ea41a3046d013a80f1 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 15 15:57:33 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 15 15:58:17 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e570c57b |
| 7 |
|
| 8 |
dev-db/mariadb-connector-c: install pkconfig file |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/668664 |
| 11 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
...b-connector-c-3.0.6-provide-pkconfig-file.patch | 48 ++++++++++++++++++++++ |
| 15 |
....ebuild => mariadb-connector-c-3.0.6-r1.ebuild} | 6 ++- |
| 16 |
.../mariadb-connector-c-9999.ebuild | 6 ++- |
| 17 |
3 files changed, 56 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..02bbefce357 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch |
| 24 |
@@ -0,0 +1,48 @@ |
| 25 |
+--- a/mariadb_config/CMakeLists.txt |
| 26 |
++++ b/mariadb_config/CMakeLists.txt |
| 27 |
+@@ -46,6 +46,8 @@ ENDIF() |
| 28 |
+ |
| 29 |
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in |
| 30 |
+ ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c @ONLY) |
| 31 |
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmariadb.pc.in |
| 32 |
++ ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc @ONLY) |
| 33 |
+ |
| 34 |
+ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c) |
| 35 |
+ |
| 36 |
+@@ -54,3 +56,6 @@ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c) |
| 37 |
+ INSTALL(TARGETS mariadb_config |
| 38 |
+ DESTINATION "bin" |
| 39 |
+ COMPONENT Development) |
| 40 |
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc |
| 41 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig |
| 42 |
++ COMPONENT Development) |
| 43 |
+--- a/mariadb_config/libmariadb.pc.in |
| 44 |
++++ b/mariadb_config/libmariadb.pc.in |
| 45 |
+@@ -1,19 +1,11 @@ |
| 46 |
+-# |
| 47 |
+-# pkg_config.pc.in |
| 48 |
+-# |
| 49 |
+-# pkg_config configuration file |
| 50 |
+-# For a detailed description of options, please visit |
| 51 |
+-# Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) |
| 52 |
+-# |
| 53 |
+- |
| 54 |
+-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ |
| 55 |
+-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ |
| 56 |
+-prefix=@PREFIX_INSTALL_DIR@ |
| 57 |
++prefix=@CMAKE_INSTALL_PREFIX@ |
| 58 |
++exec_prefix=${prefix} |
| 59 |
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
| 60 |
++includedir=${prefix}/include |
| 61 |
+ |
| 62 |
+ Name: libmariadb |
| 63 |
+-Version: @LIBMARIADB_VERSION@ |
| 64 |
+ Description: MariaDB Connector/C dynamic library |
| 65 |
+-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@ |
| 66 |
+-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ |
| 67 |
+- |
| 68 |
+- |
| 69 |
++Version: @LIBMARIADB_VERSION@ |
| 70 |
++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/ |
| 71 |
++Libs: -L${libdir} -lmariadb |
| 72 |
++Cflags: -I${includedir}/mariadb |
| 73 |
|
| 74 |
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 |
| 75 |
similarity index 95% |
| 76 |
rename from dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild |
| 77 |
rename to dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild |
| 78 |
index df11d552495..330c1ac6ef2 100644 |
| 79 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild |
| 80 |
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild |
| 81 |
@@ -1,4 +1,4 @@ |
| 82 |
-# Copyright 1999-2018 Gentoo Foundation |
| 83 |
+# Copyright 1999-2018 Gentoo Authors |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
|
| 86 |
EAPI=6 |
| 87 |
@@ -55,7 +55,9 @@ RDEPEND="${DEPEND} |
| 88 |
!>=dev-db/mariadb-10.2.0[client-libs(+)] |
| 89 |
" |
| 90 |
PATCHES=( |
| 91 |
- "${FILESDIR%/}/gentoo-layout-3.0.patch" ) |
| 92 |
+ "${FILESDIR}"/gentoo-layout-3.0.patch |
| 93 |
+ "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch |
| 94 |
+) |
| 95 |
|
| 96 |
src_configure() { |
| 97 |
# bug 508724 mariadb cannot use ld.gold |
| 98 |
|
| 99 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
| 100 |
index df11d552495..330c1ac6ef2 100644 |
| 101 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
| 102 |
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
| 103 |
@@ -1,4 +1,4 @@ |
| 104 |
-# Copyright 1999-2018 Gentoo Foundation |
| 105 |
+# Copyright 1999-2018 Gentoo Authors |
| 106 |
# Distributed under the terms of the GNU General Public License v2 |
| 107 |
|
| 108 |
EAPI=6 |
| 109 |
@@ -55,7 +55,9 @@ RDEPEND="${DEPEND} |
| 110 |
!>=dev-db/mariadb-10.2.0[client-libs(+)] |
| 111 |
" |
| 112 |
PATCHES=( |
| 113 |
- "${FILESDIR%/}/gentoo-layout-3.0.patch" ) |
| 114 |
+ "${FILESDIR}"/gentoo-layout-3.0.patch |
| 115 |
+ "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch |
| 116 |
+) |
| 117 |
|
| 118 |
src_configure() { |
| 119 |
# bug 508724 mariadb cannot use ld.gold |
Archives