diff --git a/Makefile b/Makefile index 5f935e8..8c40ef5 100644 --- a/Makefile +++ b/Makefile @@ -258,9 +258,6 @@ ${PYSIDE_SRC_DIR}: @echo "#########################" @echo "" - @echo "LD_LIBRARY_PATH = $${LD_LIBRARY_PATH}" - @echo "PYTHON_PREFIX = ${PYTHON_PREFIX}" - $(call download_extract,${PYSIDE_SRC_URL},${PYSIDE_SRC_FILE},${PYSIDE_SRC_MD5}) #git clone "${PYSIDE_SRC_GIT}" "${PYSIDE_SRC_DIR}" #cd "${PYSIDE_SRC_DIR}" && git checkout "${PYSIDE_SRC_GIT_COMMIT}" @@ -271,7 +268,7 @@ ${PYSIDE_SRC_DIR}: echo "" > "${PYSIDE_SRC_DIR}/sources/pyside2/cmake/Macros/FindQt5Extra.cmake" # Patch to prevent complete overriding of LD_LIBRARY_PATH - #patch "${PYSIDE_SRC_DIR}/sources/pyside2/cmake/Macros/PySideModules.cmake" patch/pyside2-PySideModules.cmake.patch + patch "${PYSIDE_SRC_DIR}/sources/pyside2/cmake/Macros/PySideModules.cmake" patch/pyside-5.12.3/PySideModules.cmake.patch ifneq (${QT_OPENGL_ENABLED},1) # Patches to remove OpenGL-related source files. diff --git a/patch/pyside-5.12.3/PySideModules.cmake.patch b/patch/pyside-5.12.3/PySideModules.cmake.patch new file mode 100644 index 0000000..f287ba4 --- /dev/null +++ b/patch/pyside-5.12.3/PySideModules.cmake.patch @@ -0,0 +1,20 @@ +--- pyside-src/sources/pyside2/cmake/Macros/PySideModules.cmake 2019-02-23 22:34:05.751151414 +0100 ++++ patch/PySideModules.cmake 2019-02-23 23:22:56.324976710 +0100 +@@ -162,13 +162,13 @@ + # Need to set the LD_ env vars before invoking the script, because it might use build-time + # libraries instead of install time libraries. + if (WIN32) +- set(ld_prefix "PATH=") ++ set(ld_prefix "PATH") + elseif(APPLE) +- set(ld_prefix "DYLD_LIBRARY_PATH=") ++ set(ld_prefix "DYLD_LIBRARY_PATH") + else() +- set(ld_prefix "LD_LIBRARY_PATH=") ++ set(ld_prefix "LD_LIBRARY_PATH") + endif() +- set(ld_prefix "${ld_prefix}${pysidebindings_BINARY_DIR}/libpyside${PATH_SEP}${SHIBOKEN_SHARED_LIBRARY_DIR}") ++ set(ld_prefix "${ld_prefix}=${pysidebindings_BINARY_DIR}/libpyside${PATH_SEP}${SHIBOKEN_SHARED_LIBRARY_DIR}${PATH_SEP}$ENV{${ld_prefix}}") + set(generate_pyi_options run --skip --sys-path + "${pysidebindings_BINARY_DIR}" + "${SHIBOKEN_PYTHON_MODULE_DIR}")