From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EB627138334 for ; Thu, 13 Dec 2018 11:36:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9ACC3E0DBA; Thu, 13 Dec 2018 11:36:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73A4CE0DBA for ; Thu, 13 Dec 2018 11:36:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 37250335CD9 for ; Thu, 13 Dec 2018 11:36:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9BE7A43A for ; Thu, 13 Dec 2018 11:36:51 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1544700993.057645ffcdb86bd24e7c965f6e1aa03db33abb4c.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild X-VCS-Directories: dev-db/mysql-workbench/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 057645ffcdb86bd24e7c965f6e1aa03db33abb4c X-VCS-Branch: master Date: Thu, 13 Dec 2018 11:36:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4c60469e-cbb8-4c4b-9214-29ffb7964fbb X-Archives-Hash: 456c21f0c019bfb973fdda4e83ecee52 commit: 057645ffcdb86bd24e7c965f6e1aa03db33abb4c Author: Hans de Graaff gentoo org> AuthorDate: Thu Dec 13 11:36:16 2018 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Thu Dec 13 11:36:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057645ff dev-db/mysql-workbench: fix build with libiodbc Fixes: https://bugs.gentoo.org/638188 Signed-off-by: Hans de Graaff gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild | 6 ++++++ dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild | 6 ++++++ 2 files changed, 12 insertions(+) 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"