diff options
| author | Hans de Graaff <graaff@gentoo.org> | 2018-12-13 12:36:16 +0100 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2018-12-13 12:36:33 +0100 |
| commit | 057645ffcdb86bd24e7c965f6e1aa03db33abb4c (patch) | |
| tree | 1e70600a26dc6118682dc7d9c242d4c6355b2790 | |
| parent | 0f7b9e5a0ae2efb2b9d4bfa8d994c914871e5636 (diff) | |
| download | gentoo-057645ffcdb86bd24e7c965f6e1aa03db33abb4c.tar.gz gentoo-057645ffcdb86bd24e7c965f6e1aa03db33abb4c.tar.xz | |
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
| -rw-r--r-- | dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild | 6 | ||||
| -rw-r--r-- | dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild | 6 |
2 files changed, 12 insertions, 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 index 4e80549449d..1cd099dac5d 100644 --- 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 81dcd36bcd4..4ba8f98a2a2 100644 --- 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" |