mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-31 23:08:09 -07:00
bcf84eb85c
* Wheel fix upstream. Upstream commit: 4b50508175449633348106634baba0f7ac16610c * Accomodate to build system changes. Need to add setuptools build directory to PYTHON_PATH so that a fully formed shiboken6_generator module can be used (AND avoid it using the currently installed module). Upstream commit: 39bf64f845d6b759ebc726e85949e82dab678d37 * Better document QT_REQUIREMENTS. * forwards sync generator build artifacts for pyside build Signed-off-by: Alfred Wingate <parona@protonmail.com> Part-of: https://codeberg.org/gentoo/gentoo/pulls/812 Merges: https://codeberg.org/gentoo/gentoo/pulls/812 Co-authored-by: Nowa Ammerlaan <nowa@gentoo.org> Signed-off-by: Nowa Ammerlaan <nowa@gentoo.org>
27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
diff --git a/sources/pyside6/cmake/PySideHelpers.cmake b/sources/pyside6/cmake/PySideHelpers.cmake
|
|
index ec803a1..335893f 100644
|
|
--- a/sources/pyside6/cmake/PySideHelpers.cmake
|
|
+++ b/sources/pyside6/cmake/PySideHelpers.cmake
|
|
@@ -43,6 +43,8 @@ function(pyside_internal_find_host_shiboken_tools)
|
|
if(QFP_SHIBOKEN_HOST_PATH)
|
|
list(APPEND find_package_extra_args PATHS "${QFP_SHIBOKEN_HOST_PATH}/lib/cmake")
|
|
list(PREPEND CMAKE_FIND_ROOT_PATH "${QFP_SHIBOKEN_HOST_PATH}")
|
|
+ elseif(QFP_SHIBOKEN_TARGET_PATH)
|
|
+ list(APPEND find_package_extra_args PATHS "${QFP_SHIBOKEN_TARGET_PATH}/lib/cmake")
|
|
endif()
|
|
|
|
# When doing a regular build, immediately mark the package as required.
|
|
diff --git a/sources/shiboken6/cmake/ShibokenHelpers.cmake b/sources/shiboken6/cmake/ShibokenHelpers.cmake
|
|
index 8c3c8f9..b5e3c68 100644
|
|
--- a/sources/shiboken6/cmake/ShibokenHelpers.cmake
|
|
+++ b/sources/shiboken6/cmake/ShibokenHelpers.cmake
|
|
@@ -530,6 +530,8 @@ function(shiboken_internal_find_host_shiboken_tools)
|
|
if(QFP_SHIBOKEN_HOST_PATH)
|
|
list(APPEND find_package_extra_args PATHS "${QFP_SHIBOKEN_HOST_PATH}/lib/cmake")
|
|
list(PREPEND CMAKE_FIND_ROOT_PATH "${QFP_SHIBOKEN_HOST_PATH}")
|
|
+ elseif(QFP_SHIBOKEN_TARGET_PATH)
|
|
+ list(APPEND find_package_extra_args PATHS "${QFP_SHIBOKEN_TARGET_PATH}/lib/cmake")
|
|
endif()
|
|
set(SHIBOKEN6TOOLS_SKIP_FIND_DEPENDENCIES TRUE)
|
|
find_package(
|