summaryrefslogtreecommitdiffstats
path: root/deps/PyQt
diff options
context:
space:
mode:
Diffstat (limited to 'deps/PyQt')
-rw-r--r--deps/PyQt/.url2
-rwxr-xr-xdeps/PyQt/PyQt.SlackBuild21
2 files changed, 11 insertions, 12 deletions
diff --git a/deps/PyQt/.url b/deps/PyQt/.url
index a6a5e4a..7db5c55 100644
--- a/deps/PyQt/.url
+++ b/deps/PyQt/.url
@@ -1 +1 @@
-http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.12/PyQt4_gpl_x11-4.12.tar.gz
+http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.12.1/PyQt4_gpl_x11-4.12.1.tar.gz
diff --git a/deps/PyQt/PyQt.SlackBuild b/deps/PyQt/PyQt.SlackBuild
index 664b191..22428c6 100755
--- a/deps/PyQt/PyQt.SlackBuild
+++ b/deps/PyQt/PyQt.SlackBuild
@@ -27,27 +27,26 @@
# Modified by Eric Hameleers <alien@slackware.com>
PKGNAM=PyQt
-VERSION=${VERSION:-4.12}
+VERSION=${VERSION:-4.12.1}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
if [ -z "$ARCH" ]; then
- case "$MARCH" in
- i?86) export ARCH=i586 ;;
- armv7hl) export ARCH=$MARCH ;;
- arm*) export ARCH=arm ;;
+ case "$(uname -m)" in
+ i?86) ARCH=i586 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
# Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$MARCH ;;
+ *) ARCH=$(uname -m) ;;
esac
+ export ARCH
fi
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then