Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions packages/conan/recipes/pyside/patches/libpython_in_lib64.diff
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
--- a/build_scripts/build_info_collector.py
+++ b/build_scripts/build_info_collector.py
@@ -65,8 +65,8 @@
@@ -65,7 +65,7 @@
py_include_dir):
"""Helper for finding the Python library on UNIX"""
if py_libdir is None or not Path(py_libdir).exists():
- py_libdir = Path(py_prefix) / "lib"
- if py_include_dir is None or not Path(py_include_dir).exists():
+ py_libdir = Path(py_prefix) / "lib64"
+ if True or py_include_dir is None or not Path(py_include_dir).exists():
if py_include_dir is None or not Path(py_include_dir).exists():
directory = f"include/python{py_version}"
py_include_dir = Path(py_prefix) / directory
lib_exts = ['.so']
@@ -202,6 +202,10 @@
else:
py_scripts_dir = py_prefix / "bin"
self.py_scripts_dir = py_scripts_dir
+ # ASWF: with a non relocatable Python Conan package, sysconfig
+ # returns a path to the Python package inside the build folder
+ directory = f"include/python{py_version}"
+ py_include_dir = py_prefix / directory
else:
# We don't look for an interpreter when cross-compiling.
py_executable = None
Loading