From 338b3b02b7bb7e3f8bde1645c694c2b6c6d42b11 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Tue, 6 Mar 2018 21:40:28 +0100 Subject: deps/PyQt5: remove the correct bits I messed up on several levels. The python2 version should use port_v2 and python3 version should use port_v3. The others can be safely removed: - rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v3/ - rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/ + rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/ + rm -rf $PKG/$PYTHONLIB/${PKGNAM}/uic/port_v3/ --- deps/PyQt5/PyQt5.SlackBuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'deps/PyQt5/PyQt5.SlackBuild') diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild index b24bc5c..e64a29f 100755 --- a/deps/PyQt5/PyQt5.SlackBuild +++ b/deps/PyQt5/PyQt5.SlackBuild @@ -101,7 +101,7 @@ if [ -n "${PYTHON3LIB}" ]; then mv $PKG/usr/bin/pyrcc5 $PKG/usr/bin/pyrcc5-py3 mv $PKG/usr/bin/pyuic5 $PKG/usr/bin/pyuic5-py3 mv $PKG/usr/bin/pylupdate5 $PKG/usr/bin/pylupdate5-py3 - rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v3/ + rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/ fi python configure.py \ @@ -115,7 +115,7 @@ make $NUMJOBS || make || exit 1 # INSTALL_ROOT is needed to install libpyqt4.so properly: make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 -rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/ +rm -rf $PKG/$PYTHONLIB/${PKGNAM}/uic/port_v3/ find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -- cgit v1.2.3