diff options
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch')
-rw-r--r-- | meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch b/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch index 6455c95e77..761422e07e 100644 --- a/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch +++ b/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3abfa65517959ad279481021fafefba28f955e76 Mon Sep 17 00:00:00 2001 | 1 | From 2e9318f7a70699eed239aee6301d1d0bbd2457ee Mon Sep 17 00:00:00 2001 |
2 | From: Philip Balister <philip@balister.org> | 2 | From: Philip Balister <philip@balister.org> |
3 | Date: Fri, 10 Jul 2020 10:14:59 -0400 | 3 | Date: Fri, 10 Jul 2020 10:14:59 -0400 |
4 | Subject: [PATCH] Do not check pointer size when cross compiling. | 4 | Subject: [PATCH] Do not check pointer size when cross compiling. |
@@ -8,23 +8,24 @@ It is reasonable to build for 32 machine on a 64 bit build machine. Prevents: | |||
8 | | Python config failure: Python is 64-bit, chosen compiler is 32-bit | 8 | | Python config failure: Python is 64-bit, chosen compiler is 32-bit |
9 | 9 | ||
10 | Signed-off-by: Philip Balister <philip@balister.org> | 10 | Signed-off-by: Philip Balister <philip@balister.org> |
11 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
11 | --- | 12 | --- |
12 | tools/FindPythonLibsNew.cmake | 2 +- | 13 | tools/FindPythonLibsNew.cmake | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/tools/FindPythonLibsNew.cmake b/tools/FindPythonLibsNew.cmake | 16 | diff --git a/tools/FindPythonLibsNew.cmake b/tools/FindPythonLibsNew.cmake |
16 | index d0c8fa2..8479e70 100644 | 17 | index 3605aebc..67f4d4a0 100644 |
17 | --- a/tools/FindPythonLibsNew.cmake | 18 | --- a/tools/FindPythonLibsNew.cmake |
18 | +++ b/tools/FindPythonLibsNew.cmake | 19 | +++ b/tools/FindPythonLibsNew.cmake |
19 | @@ -123,7 +123,7 @@ list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH) | 20 | @@ -156,7 +156,7 @@ list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH) |
20 | 21 | ||
21 | # Make sure the Python has the same pointer-size as the chosen compiler | 22 | # Make sure the Python has the same pointer-size as the chosen compiler |
22 | # Skip if CMAKE_SIZEOF_VOID_P is not defined | 23 | # Skip if CMAKE_SIZEOF_VOID_P is not defined |
23 | -if(CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) | 24 | -if(CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) |
24 | +if((NOT CMAKE_CROSSCOMPILING) AND CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) | 25 | +if((NOT CMAKE_CROSSCOMPILING) AND CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) |
25 | if(PythonLibsNew_FIND_REQUIRED) | 26 | if(PythonLibsNew_FIND_REQUIRED) |
26 | math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8") | 27 | math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8") |
27 | math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8") | 28 | math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8") |
28 | -- | 29 | -- |
29 | 2.25.4 | 30 | 2.17.1 |
30 | 31 | ||