From 6fc26582abf75b6fdcc1483dcfd4022fc69e5490 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 14 Oct 2017 19:29:39 +0200 Subject: Updated deps for the next release --- deps/sip/sip.SlackBuild | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'deps/sip/sip.SlackBuild') diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild index 57b365d..f34860c 100755 --- a/deps/sip/sip.SlackBuild +++ b/deps/sip/sip.SlackBuild @@ -54,8 +54,11 @@ else SLKCFLAGS="-O2" fi -PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) -PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' ) +PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null) +PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' 2>/dev/null ) + +PYTHON3VER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null) +PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null ) CWD=$(pwd) TMP=${TMP:-/tmp} @@ -74,10 +77,21 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +if [ -n "${PYTHON3LIB}" ]; then + python3 configure.py \ + -b "/usr/bin" \ + -d "$PYTHON3LIB" \ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + + mv $PKG/usr/bin/sip $PKG/usr/bin/sip3 +fi + python configure.py \ -b "/usr/bin" \ -d "$PYTHONLIB" \ - -e "/usr/include/python$PYTHONVER" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ || exit 1 -- cgit v1.2.3