summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2015-07-12 09:53:38 +0000
committerHans de Graaff <graaff@gentoo.org>2015-07-12 09:53:38 +0000
commit2ab858b327431ae144ce58dea359ee2448634d79 (patch)
tree1bc114ccc6ded8375648b7e38179a850c4a79ca6 /dev-db
parentStable for HPPA PPC64 (bug #532968). (diff)
downloadgentoo-2-2ab858b327431ae144ce58dea359ee2448634d79.tar.gz
gentoo-2-2ab858b327431ae144ce58dea359ee2448634d79.tar.bz2
gentoo-2-2ab858b327431ae144ce58dea359ee2448634d79.zip
Fix underlinking in db.mysql.sqlparser module, fixing bug 540164.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mysql-workbench/ChangeLog5
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 9f409642f99f..816922e0200b 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-db/mysql-workbench
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.120 2015/07/11 19:19:37 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.121 2015/07/12 09:53:38 graaff Exp $
+
+ 12 Jul 2015; Hans de Graaff <graaff@gentoo.org> mysql-workbench-6.3.4.ebuild:
+ Fix underlinking in db.mysql.sqlparser module, fixing bug 540164.
11 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> mysql-workbench-6.3.3.ebuild:
x86 stable wrt bug #552438
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild
index dce8998a1a49..0d994a967675 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild,v 1.1 2015/06/19 06:07:54 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild,v 1.2 2015/07/12 09:53:38 graaff Exp $
EAPI=5
GCONF_DEBUG="no"
@@ -78,6 +78,9 @@ src_prepare() {
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
"${FILESDIR}/${PN}-6.3.3-mysql_options4.patch"
+ sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \
+ modules/db.mysql.sqlparser/CMakeLists.txt
+
## remove hardcoded CXXFLAGS
sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die