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

Fixes: https://bugs.gentoo.org/638188
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
index 4e80549449d43331ceeb568e2c708fbdf369bf6f..1cd099dac5dfc973e5bfa5062117a1f5fee4b6d7 100644 (file)
--- 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
index 81dcd36bcd4ee577d07fee4ac8e0717b4e757fc2..4ba8f98a2a2e787975aacfa80d84f9bae00caab6 100644 (file)
--- 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"