dev-db/mysql-workbench: fix build with libiodbc

Fixes: https://bugs.gentoo.org/638188 Signed-off-by: Hans de Graaff <[email protected]> Package-Manager: Portage-2.3.51, Repoman-2.3.11
johu · Dec 13, 2018 · 057645f · 057645f
1 parent 0f7b9e5
commit 057645f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
@@ -88,10 +88,16 @@ src_prepare() {
 }
 
 src_configure() {
+	if has_version dev-db/libiodbc ; then
+		IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
+	fi
+
 	append-cxxflags -std=c++11
 	local mycmakeargs=(
 		-DUSE_GNOME_KEYRING="$(usex gnome-keyring)"
 		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
+		${IODBC}
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
 		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
@@ -89,12 +89,18 @@ src_prepare() {
 }
 
 src_configure() {
+	if has_version dev-db/libiodbc ; then
+		IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
+	fi
+
 	append-cxxflags -std=c++11
 	ANTLR_JAR_PATH="${DISTDIR}/antlr-4.7.1-complete.jar"
 	local mycmakeargs=(
 		-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
 		-DUSE_GNOME_KEYRING="$(usex gnome-keyring)"
 		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
+		${IODBC}
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
 		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"