diff options
Diffstat (limited to 'dev-python/pyside/pyside-6.9999.ebuild')
| -rw-r--r-- | dev-python/pyside/pyside-6.9999.ebuild | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/dev-python/pyside/pyside-6.9999.ebuild b/dev-python/pyside/pyside-6.9999.ebuild index 0cc05197aff0..5e583ba3e82d 100644 --- a/dev-python/pyside/pyside-6.9999.ebuild +++ b/dev-python/pyside/pyside-6.9999.ebuild @@ -30,7 +30,7 @@ if [[ ${PV} == *.9999 ]]; then EGIT_BRANCH=dev [[ ${PV} == 6.*.9999 ]] && EGIT_BRANCH=${PV%.9999} else - SRC_URI="https://download.qt.io/official_releases/QtForPython/${PN}6/PySide6-6.8.3-src/${MY_P}.tar.xz" + SRC_URI="https://download.qt.io/official_releases/QtForPython/${PN}6/PySide6-${PV}-src/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi @@ -359,9 +359,15 @@ python_compile() { --build-type=shiboken6 ) distutils-r1_python_compile + + # The build system uses its own build dir, find the name of this dir. + local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp-*' -printf "%f\n") + export BUILD_ID=${pyside_build_dir#qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-} + DISTUTILS_ARGS=( "${MAIN_DISTUTILS_ARGS[@]}" --reuse-build + --shiboken-target-path="${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))/${pyside_build_dir}/install" --build-type=shiboken6-generator ) distutils-r1_python_compile @@ -370,7 +376,7 @@ python_compile() { DISTUTILS_ARGS=( "${MAIN_DISTUTILS_ARGS[@]}" --reuse-build - --shiboken-target-path="$(find "${BUILD_DIR}/build" -type d -name cmake)/../../" + --shiboken-target-path="${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))/${pyside_build_dir}/install" --build-type=pyside6 ) distutils-r1_python_compile @@ -424,7 +430,7 @@ python_compile() { done # Install misc files from inner install dir - find "${BUILD_DIR}"/build/*/install -type f \ + find "${BUILD_DIR}"/build*/${pyside_build_dir}/install -type f \ -name libPySidePlugin.so -exec \ mkdir -p "${BUILD_DIR}/install/$(qt6_get_plugindir)/designer/" \; \ -exec \ @@ -432,7 +438,7 @@ python_compile() { || die for dir in cmake pkgconfig; do - find "${BUILD_DIR}"/build/*/install -type d -name ${dir} \ + find "${BUILD_DIR}"/build*/${pyside_build_dir}/install -type d -name ${dir} \ -exec cp -r "{}" "${BUILD_DIR}/install/usr/lib/" \; \ || die done @@ -484,18 +490,11 @@ python_compile() { } python_test() { - # figure out the build dir - local build_dir build_classifier - build_dir=$(ls -d "${BUILD_DIR}"/build/qfp-*/build/) - build_classifier="${build_dir##${BUILD_DIR}/build/qfp-}" - build_classifier="${build_dir%%/build}" - # Otherwise it picks the last built directory breaking assumption for multi target builds mkdir -p build_history/9999-99-99_999999/ || die - cat <<- EOF > build_history/9999-99-99_999999/build_dir.txt || die - ${build_dir} - ${build_classifier} - EOF + local pyside_build_dir=qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID} + echo "$(ls -d "${BUILD_DIR}"/build*/${pyside_build_dir}/build | sort -V | tail -n 1)" > build_history/9999-99-99_999999/build_dir.txt || die + echo "${pyside_build_dir}" >> build_history/9999-99-99_999999/build_dir.txt || die virtx ${EPYTHON} testrunner.py test --projects=shiboken6 $(usev core '--projects=pyside6') || die "Tests failed with ${EPYTHON}" |