[patch] Patch

mariadb-connector-c.patch (text/plain), 2.15 KB, created by Arfrever Frehtes Taifersar Arahesis on 2018-10-29 06:18:27 UTC

From 36bb801c07932853abd7025749c65318470f307c Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Mon, 29 Oct 2018 02:32:54 +0100
Subject: [PATCH] dev-db/mariadb-connector-c: USE=mysqlcompat: Use separate
 symbolic link for each header.

If /usr/include/mysql was a symbolic link, it would collide with
/usr/include/mysql directory installed by dev-db/mariadb.

Closes: https://bugs.gentoo.org/668560

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 .../mariadb-connector-c-3.0.6-r1.ebuild               | 11 ++++++++++-
 .../mariadb-connector-c-9999.ebuild                   | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index a72bd4c2353..2b9448120c9 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -97,6 +97,15 @@ multilib_src_install_all() {
 	fi
 	if use mysqlcompat ; then
 		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
+
+		pushd "${ED}/usr/include/mariadb" > /dev/null || die
+		local f
+		for f in *.h; do
+			dosym ../mariadb/${f} /usr/include/mysql/${f}
+		done
+		for f in */*.h; do
+			dosym ../../mariadb/${f} /usr/include/mysql/${f}
+		done
+		popd > /dev/null || die
 	fi
 }
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 1b2b77025ff..8effbbe0378 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -97,6 +97,15 @@ multilib_src_install_all() {
 	fi
 	if use mysqlcompat ; then
 		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
+
+		pushd "${ED}/usr/include/mariadb" > /dev/null || die
+		local f
+		for f in *.h; do
+			dosym ../mariadb/${f} /usr/include/mysql/${f}
+		done
+		for f in */*.h; do
+			dosym ../../mariadb/${f} /usr/include/mysql/${f}
+		done
+		popd > /dev/null || die
 	fi
 }
-- 
2.19.1