[arch-commits] Commit in mysql-workbench/trunk (PKGBUILD)

[Christian Hesse]

    Date: Thursday, November 16, 2017 @ 13:09:31
  Author: eworm
Revision: 266959

upgpkg: mysql-workbench 6.3.9-8

build bundled libraries with default flags

Modified:
  mysql-workbench/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-16 13:04:47 UTC (rev 266958)
+++ PKGBUILD	2017-11-16 13:09:31 UTC (rev 266959)
@@ -7,7 +7,7 @@
 
 pkgname=mysql-workbench
 pkgver=6.3.9
-pkgrel=7
+pkgrel=8
 _mysql_version=5.7.20
 _connector_version=1.1.9
 _gdal_version=2.2.2
@@ -23,9 +23,6 @@
 optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password manager'
 	'python2-pyodbc: database migration')
 makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick')
-# this breaks at runtime with our default build flags
-# TODO: remove in future
-options=('!buildflags')
 validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
 source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
 	"https://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
@@ -138,6 +135,9 @@
 	make
 	make DESTDIR="${srcdir}/install-bundle/" install
 
+	# fix: Can't get 'MysqlSqlFacade' module.
+	unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
+
 	# Build MySQL Workbench itself with bundled libs
 	cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
 	cmake . \