diff --git a/package-system/pyside2/Dockerfile b/package-system/pyside2/Dockerfile index 6b5fc2db..221584ce 100644 --- a/package-system/pyside2/Dockerfile +++ b/package-system/pyside2/Dockerfile @@ -75,7 +75,7 @@ RUN if [ "$(uname -m)" = "aarch64" ]; then \ # Copy the build script specific to this Docker script in order to execute the build ARG CACHEBUST=1 -COPY ${DOCKER_BUILD_SCRIPT} /data/workspace/ COPY src /data/workspace/src/ +COPY ${DOCKER_BUILD_SCRIPT} /data/workspace/ ENTRYPOINT ["/bin/bash"] diff --git a/package-system/pyside2/build-linux.sh b/package-system/pyside2/build-linux.sh index d733cfbc..f1571570 100755 --- a/package-system/pyside2/build-linux.sh +++ b/package-system/pyside2/build-linux.sh @@ -11,11 +11,11 @@ if [ "$(uname -m)" = "aarch64" ] then - PYTHON_FOLDER_NAME=python-3.10.5-rev2-linux-aarch64 - QT_FOLDER_NAME=qt-5.15.2-rev8-linux-aarch64 + PYTHON_FOLDER_NAME=python-3.10.13-rev2-linux-aarch64 + QT_FOLDER_NAME=qt-5.15.2-rev9-linux-aarch64 else - PYTHON_FOLDER_NAME=python-3.10.5-rev2-linux - QT_FOLDER_NAME=qt-5.15.2-rev8-linux + PYTHON_FOLDER_NAME=python-3.10.13-rev2-linux + QT_FOLDER_NAME=qt-5.15.2-rev9-linux fi DOCKER_BUILD_SCRIPT=docker_build_linux.sh diff --git a/package-system/pyside2/build_config.json b/package-system/pyside2/build_config.json index 013f632d..890f649b 100644 --- a/package-system/pyside2/build_config.json +++ b/package-system/pyside2/build_config.json @@ -1,8 +1,8 @@ { - "git_url": "https://code.qt.io/cgit/pyside/pyside-setup.git", + "git_url": "https://code.qt.io/pyside/pyside-setup", "git_tag": "v5.15.2.1", "package_name": "pyside2", - "package_version": "5.15.2.1-py3.10-rev4", + "package_version": "5.15.2.1-py3.10-rev5", "package_url": "https://code.qt.io/cgit/pyside/pyside-setup.git", "package_license": "custom", "package_license_file": "pyside2/LICENSE.LGPLv3", @@ -30,8 +30,8 @@ "Linux": { "Linux": { "depends_on_packages" :[ - ["python-3.10.5-rev2-linux", "eda1fdc9129fb70df2d63bd21d0876c83c4f7021864f22c85850f4a8ff8cf1bf", ""], - ["qt-5.15.2-rev8-linux", "613d6a404b305ce0e715c57c936dc00318fb9f0d2d3f6609f8454c198f993095", ""] + ["python-3.10.13-rev2-linux", "a7832f9170a3ac93fbe678e9b3d99a977daa03bb667d25885967e8b4977b86f8", ""], + ["qt-5.15.2-rev9-linux", "db4bcd2003262f4d8c7d7da832758824fc24e53da5895edef743f67a64a5c734", ""] ], "cmake_find_source": "Findpyside2.cmake", "custom_build_cmd": [ @@ -43,8 +43,8 @@ }, "Linux-aarch64": { "depends_on_packages" :[ - ["python-3.10.5-rev2-linux-aarch64", "a02bfb612005af364872aac96e569cef1ad84ba65632d88d04b34a99d45b077c", ""], - ["qt-5.15.2-rev8-linux-aarch64", "c437ee1c7a4fe84002352a2f8ed230c822a13dcc80735a4fecf3b3af6e34bb63", ""] + ["python-3.10.13-rev2-linux-aarch64", "30bc2731e2ac54d8e22d36ab15e30b77aefe2dce146ef92d6f20adc0a9c5b14e", ""], + ["qt-5.15.2-rev9-linux-aarch64", "da80840ecd3f7a074edecbb3dedb1ff36c568cfe4943e18d9559e9fca9f151bc", ""] ], "cmake_find_source": "Findpyside2.cmake", "custom_build_cmd": [ diff --git a/package-system/pyside2/docker_build_linux.sh b/package-system/pyside2/docker_build_linux.sh index 6e17c617..81ddaf13 100755 --- a/package-system/pyside2/docker_build_linux.sh +++ b/package-system/pyside2/docker_build_linux.sh @@ -36,6 +36,11 @@ then exit 1 fi +echo Sym-linking python +pushd ${BASE_ROOT}/build +ln -s ${DEP_PYTHON_BASE}/python python +popd + echo Building source pushd ${BASE_ROOT}/src @@ -84,11 +89,11 @@ cp -r $INSTALL_SOURCE/share $PACKAGE_BASE # RPATH fixes -$BASE_ROOT/src/patchelf --set-rpath \$ORIGIN $PACKAGE_BASE/lib/libpyside2.abi3.so.5.15.2.1 -$BASE_ROOT/src/patchelf --set-rpath \$ORIGIN $PACKAGE_BASE/lib/libshiboken2.abi3.so.5.15.2.1 -$BASE_ROOT/src/patchelf --set-rpath \$ORIGIN $PACKAGE_BASE/lib/python3.10/site-packages/shiboken2/shiboken2.abi3.so -$BASE_ROOT/src/patchelf --set-rpath \$ORIGIN $PACKAGE_BASE/bin/shiboken2 -$BASE_ROOT/src/patchelf --set-rpath \$ORIGIN $PACKAGE_BASE/bin/pyside2-lupdate +$BASE_ROOT/src/patchelf --force-rpath --set-rpath "\$ORIGIN" $PACKAGE_BASE/lib/libpyside2.abi3.so.5.15.2.1 +$BASE_ROOT/src/patchelf --force-rpath --set-rpath "\$ORIGIN" $PACKAGE_BASE/lib/libshiboken2.abi3.so.5.15.2.1 +$BASE_ROOT/src/patchelf --force-rpath --set-rpath "\$ORIGIN" $PACKAGE_BASE/lib/python3.10/site-packages/shiboken2/shiboken2.abi3.so +$BASE_ROOT/src/patchelf --force-rpath --set-rpath "\$ORIGIN" $PACKAGE_BASE/bin/shiboken2 +$BASE_ROOT/src/patchelf --force-rpath --set-rpath "\$ORIGIN" $PACKAGE_BASE/bin/pyside2-lupdate exit 0 diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json index ea2e7bb4..e75f8d16 100644 --- a/package_build_list_host_linux-aarch64.json +++ b/package_build_list_host_linux-aarch64.json @@ -32,7 +32,7 @@ "PhysX-5.1.1-rev4-linux-aarch64": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.1.1 --package-rev rev4 --platform-name linux-aarch64", "png-1.6.37-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Linux-aarch64 --clean", "poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri/build_package_image.py --platform-name linux-aarch64", - "pyside2-5.15.2.1-py3.10-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux-aarch64 --clean", + "pyside2-5.15.2.1-py3.10-rev5-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux-aarch64 --clean", "python-3.10.13-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean", "qt-5.15.2-rev9-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --clean", "sdformat-13.5.0-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sdformat --platform-name Linux-aarch64 --clean", @@ -73,7 +73,7 @@ "PhysX-5.1.1-rev4-linux-aarch64": "package-system/PhysX5/temp/PhysX5-linux-aarch64", "png-1.6.37-rev2-linux-aarch64": "package-system/libpng/temp/png-linux-aarch64", "poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri-linux-aarch64", - "pyside2-5.15.2.1-py3.10-rev4-linux-aarch64": "package-system/pyside2/temp/pyside2-linux-aarch64", + "pyside2-5.15.2.1-py3.10-rev5-linux-aarch64": "package-system/pyside2/temp/pyside2-linux-aarch64", "python-3.10.13-rev2-linux-aarch64": "package-system/python/temp/python-linux-aarch64", "qt-5.15.2-rev9-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64", "sdformat-13.5.0-rev2-linux-aarch64": "package-system/sdformat/temp/sdformat-linux-aarch64", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index 7e87966a..604edec2 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -20,7 +20,7 @@ "libsamplerate-0.2.1-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libsamplerate --platform-name Linux --package-root ../../package-system --clean", "mcpp-2.7.2_az.1-rev1-linux": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.1-rev1", "OpenMesh-8.1-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenMesh --platform-name Linux --package-root ../../package-system --clean", - "pyside2-5.15.2.1-py3.10-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux --package-root ../../package-system/pyside2/temp --clean", + "pyside2-5.15.2.1-py3.10-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux --package-root ../../package-system/pyside2/temp --clean", "OpenEXR-3.1.3-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Linux --package-root ../../package-system/OpenEXR/temp --clean", "OpenXR-1.0.22-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenXR --platform-name Linux --package-root ../../package-system --clean", "openimageio-opencolorio-2.3.17-rev2-linux": "package-system/openimageio-opencolorio/build_openimageio.py --package-name=openimageio-opencolorio-2.3.17-rev2-linux --clean", @@ -67,7 +67,7 @@ "libsamplerate-0.2.1-rev2-linux": "package-system/libsamplerate-linux", "mcpp-2.7.2_az.1-rev1-linux": "package-system/mcpp-linux", "OpenMesh-8.1-rev3-linux": "package-system/OpenMesh-linux", - "pyside2-5.15.2.1-py3.10-rev4-linux": "package-system/pyside2/temp/pyside2-linux", + "pyside2-5.15.2.1-py3.10-rev5-linux": "package-system/pyside2/temp/pyside2-linux", "OpenEXR-3.1.3-rev4-linux": "package-system/OpenEXR/temp/OpenEXR-linux", "OpenXR-1.0.22-rev2-linux": "package-system/OpenXR-linux", "openimageio-opencolorio-2.3.17-rev2-linux": "package-system/openimageio-opencolorio/temp/package-linux",