gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

dev-python/pyside: use pyside_build_id instead of BUILD_ID (which interferes with portage)

Browse Source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel 2025-04-18 16:14:36 +02:00
parent de96d3d32e
commit 357e74b34b
No known key found for this signature in database
GPG Key ID: DC2B16215ED5412A
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-python/pyside/pyside-6.8.2-r1.ebuild
View File

@ -365,7 +365,7 @@ 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*-py*-qt*-*' -printf "%f\n")
export BUILD_ID=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-}
export pyside_build_id=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-}
DISTUTILS_ARGS=(
"${MAIN_DISTUTILS_ARGS[@]}"
@ -495,7 +495,7 @@ python_compile() {
python_test() {
# Otherwise it picks the last built directory breaking assumption for multi target builds
mkdir -p build_history/9999-99-99_999999/ || die
local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID}
local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${pyside_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

4
dev-python/pyside/pyside-6.8.3.ebuild
View File

@ -363,7 +363,7 @@ 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*-py*-qt*-*' -printf "%f\n")
export BUILD_ID=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-}
export pyside_build_id=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-}
DISTUTILS_ARGS=(
"${MAIN_DISTUTILS_ARGS[@]}"
@ -493,7 +493,7 @@ python_compile() {
python_test() {
# Otherwise it picks the last built directory breaking assumption for multi target builds
mkdir -p build_history/9999-99-99_999999/ || die
local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID}
local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${pyside_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

4
dev-python/pyside/pyside-6.9.0.ebuild
View File

@ -363,7 +363,7 @@ 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*-py*-qt*-*' -printf "%f\n")
export BUILD_ID=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-}
export pyside_build_id=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-}
DISTUTILS_ARGS=(
"${MAIN_DISTUTILS_ARGS[@]}"
@ -493,7 +493,7 @@ python_compile() {
python_test() {
# Otherwise it picks the last built directory breaking assumption for multi target builds
mkdir -p build_history/9999-99-99_999999/ || die
local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID}
local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${pyside_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

4
dev-python/pyside/pyside-6.9.9999.ebuild
View File

@ -363,7 +363,7 @@ 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*-py*-qt*-*' -printf "%f\n")
export BUILD_ID=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-}
export pyside_build_id=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-}
DISTUTILS_ARGS=(
"${MAIN_DISTUTILS_ARGS[@]}"
@ -493,7 +493,7 @@ python_compile() {
python_test() {
# Otherwise it picks the last built directory breaking assumption for multi target builds
mkdir -p build_history/9999-99-99_999999/ || die
local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID}
local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${pyside_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

4
dev-python/pyside/pyside-6.9999.ebuild
View File

@ -363,7 +363,7 @@ 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*-py*-qt*-*' -printf "%f\n")
export BUILD_ID=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-}
export pyside_build_id=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-}
DISTUTILS_ARGS=(
"${MAIN_DISTUTILS_ARGS[@]}"
@ -493,7 +493,7 @@ python_compile() {
python_test() {
# Otherwise it picks the last built directory breaking assumption for multi target builds
mkdir -p build_history/9999-99-99_999999/ || die
local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID}
local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${pyside_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