summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2014-01-06 16:56:11 +0100
committerErik Hanson <erik@slackbuilds.org>2014-01-07 11:13:07 -0600
commit5c0c01fbed315fd0a672162474040974a6169ab0 (patch)
tree4fbbcc588782e63cf9fd40469b4f3887d489d728
parenta758e7fbd8809c18f000b2980904088c71f8136c (diff)
downloadslackbuilds-5c0c01fbed315fd0a672162474040974a6169ab0.tar.gz
development/mysql-workbench: Force building over python-2.7.
(In case python-3.x is also installed) Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--development/mysql-workbench/README3
-rw-r--r--development/mysql-workbench/mysql-workbench.SlackBuild11
2 files changed, 10 insertions, 4 deletions
diff --git a/development/mysql-workbench/README b/development/mysql-workbench/README
index 9afc1c8f09..8a3181ae40 100644
--- a/development/mysql-workbench/README
+++ b/development/mysql-workbench/README
@@ -12,3 +12,6 @@ environment for:
You need to allow MySQL to accept incoming connections from outside:
Remove or comment this line: SKIP="--skip-networking" and then do:
/etc/rc.d/rc.mysqld restart
+
+Note: MySQL Workbench will be built against Python 2.7 even when Python 3.x
+is installed on your system
diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index e28e8db0fd..d9e6c72add 100644
--- a/development/mysql-workbench/mysql-workbench.SlackBuild
+++ b/development/mysql-workbench/mysql-workbench.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for mysql-workbench
# Originally written by André Geraldo Vieira <andre.geraldo@gmail.com>
-# Copyright 2013 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
PRGNAM=mysql-workbench
VERSION=${VERSION:-6.0.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
SRCVERSION=$VERSION-src
@@ -67,8 +67,8 @@ tar xvf $CWD/$PRGNAM-community-$SRCVERSION.tar.gz
cd $PRGNAM-community-$SRCVERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
@@ -82,7 +82,10 @@ cmake \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \
+ -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
+ -DPYTHON_LIBRARY:FILEPATH=/usr/lib$LIBDIRSUFFIX/libpython2.7.so \
-DCMAKE_BUILD_TYPE=Release ..
+
make
# we will remove it later after installation