diff --git a/dev-python/pyqt/pyqt-5.13.1.recipe b/dev-python/pyqt/pyqt-5.13.1.recipe index 94228555e..9b8a59f3a 100644 --- a/dev-python/pyqt/pyqt-5.13.1.recipe +++ b/dev-python/pyqt/pyqt-5.13.1.recipe @@ -5,7 +5,7 @@ simplicity of Python." HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/" COPYRIGHT="2015-2019 Riverbank Computing Limited" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://www.riverbankcomputing.com/static/Downloads/PyQt5/$portVersion/PyQt5_gpl-$portVersion.tar.gz" CHECKSUM_SHA256="54b7f456341b89eeb3930e786837762ea67f235e886512496c4152ebe106d4af" SOURCE_DIR="PyQt5_gpl-$portVersion" @@ -168,9 +168,13 @@ BUILD() cp -R $sourceDir ${sourceDir}_build cp -R $sourceDir ${sourceDir}_build3 + local packageLinksDir=$(dirname $portPackageLinksDir) + local pythonPackageName="${portName}_python-$portFullVersion" + local python3PackageName="${portName}_python3-$portFullVersion" + cd ${sourceDir}_build # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 + python=$packageLinksDir/$pythonPackageName/cmd~python2/bin/python2 pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ export PYTHONPATH=$installLocation:$OLDPYTHONPATH @@ -189,14 +193,14 @@ BUILD() --disable=_QOpenGLFunctions_2_0 \ --disable=_QOpenGLFunctions_2_1 \ --disable=_QOpenGLFunctions_4_1_Core \ - #--verbose + --verbose make $jobArgs cd ${sourceDir}_build3 # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3 + python=$packageLinksDir/$python3PackageName/cmd~python$PYTHON3_VERSION/bin/python3 pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ export PYTHONPATH=$installLocation:$OLDPYTHONPATH @@ -223,9 +227,14 @@ BUILD() INSTALL() { OLDPYTHONPATH=$PYTHONPATH + + local packageLinksDir=$(dirname $portPackageLinksDir) + local pythonPackageName="${portName}_python-$portFullVersion" + local python3PackageName="${portName}_python3-$portFullVersion" + cd ${sourceDir}_build # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 + python=$packageLinksDir/$pythonPackageName/cmd~python2/bin/python2 pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ export PYTHONPATH=$installLocation:$OLDPYTHONPATH @@ -245,7 +254,7 @@ INSTALL() cd ${sourceDir}_build3 # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3 + python=$packageLinksDir/$python3PackageName/cmd~python$PYTHON3_VERSION/bin/python3 pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ export PYTHONPATH=$installLocation:$OLDPYTHONPATH