summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2023-06-15 14:08:29 +0200
committerHans de Graaff <graaff@gentoo.org>2023-06-15 14:08:29 +0200
commitc6ba1aaf31fe16e83c376c279e8e923c6feb69dc (patch)
tree427e79f56c2a3bd5e5379ec78a939ff8818b5470
parentdev-db/mysql-workbench: require new enough jre (diff)
downloadgentoo-c6ba1aaf31fe16e83c376c279e8e923c6feb69dc.tar.gz
gentoo-c6ba1aaf31fe16e83c376c279e8e923c6feb69dc.tar.bz2
gentoo-c6ba1aaf31fe16e83c376c279e8e923c6feb69dc.zip
dev-db/mysql-workbench: fix unixODBC compilation
The mysql-workbench code already was changed to work with the latest unixODBC release. Revert the workaround and require the latest version. Signed-off-by: Hans de Graaff <graaff@gentoo.org>
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild4
1 files changed, 1 insertions, 3 deletions
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
index 8d82780756f3..c7a1e0a6bc79 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
@@ -51,7 +51,7 @@ CDEPEND="${PYTHON_DEPS}
dev-libs/tinyxml[stl]
>=dev-db/mysql-connector-c++-8.0.27-r1
dev-db/vsqlite++
- || ( dev-db/libiodbc dev-db/unixODBC )
+ || ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 )
dev-python/pexpect
>=dev-python/paramiko-1.7.4
"
@@ -83,8 +83,6 @@ src_prepare() {
sed -i -e 's/-Werror//' CMakeLists.txt || die
## Fix doc install directory
sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
- ## Look for an existing header file
- sed -i -e 's/unixodbc.h/unixodbc_conf.h/' build/cmake/Modules/FindUNIXODBC.cmake || die
## package is very fragile...
strip-flags