From 92437856b0ef2c059cc9c19be5d89b3c1a048c12 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Mon, 17 Dec 2018 12:04:49 +0100 Subject: [PATCH] dev-db/mariadb-connector-c: fix pkg-config file install location Bug: https://bugs.gentoo.org/673218 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann --- ...-connector-c-3.0.7-fix-pkconfig-file.patch | 21 +++++++++++++++++++ .../mariadb-connector-c-9999.ebuild | 1 + 2 files changed, 22 insertions(+) create mode 100644 dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch 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.patch new file mode 100644 index 000000000000..1a16a2c01015 --- /dev/null +++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch @@ -0,0 +1,21 @@ +--- a/mariadb_config/libmariadb.pc.in ++++ b/mariadb_config/libmariadb.pc.in +@@ -7,13 +7,12 @@ + # + + prefix=@CMAKE_INSTALL_PREFIX@ +-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ +-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ ++includedir=${prefix}/include ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + + Name: libmariadb + Version: @CPACK_PACKAGE_VERSION@ ++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/ + Description: MariaDB Connector/C dynamic library +-Cflags: -I${includedir} +-Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@ +- +- ++Cflags: -I${includedir}/mariadb ++Libs: -L${libdir} -lmariadb 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 b6cc03960bed..2e5ed26b63e0 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild @@ -72,6 +72,7 @@ multilib_src_configure() { -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF) -DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" -DINSTALL_LIBDIR="$(get_libdir)" + -DINSTALL_PCDIR="$(get_libdir)/pkgconfig" -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" -DINSTALL_BINDIR=bin -DWITH_UNIT_TESTS=$(usex test ON OFF) -- 2.26.2