summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2022-08-26 10:09:10 -0400
committerKhem Raj <raj.khem@gmail.com>2022-08-27 07:37:45 -0700
commit8eb19057808cb54031509f4a77fce04b82a6bd6d (patch)
treec51aac50f6d67d07513c5629e243fdb0b3fab2c0 /meta-python/recipes-devtools/python
parentf1a45bbc99c6d61112127e5ccfa336047f421e35 (diff)
downloadmeta-openembedded-8eb19057808cb54031509f4a77fce04b82a6bd6d.tar.gz
python3-pybind11: Update to Version 2.10.0.
* Dropped patch for cross compile. 918d4481a4f69c7a4cbb4282acbabd28e2433039 fixes this upstream. * This also fixing an issue building gnuradio where pybind looked for something in /usr/include/pythonX.Y on the build machine. Signed-off-by: Philip Balister <philip@balister.org> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python')
-rw-r--r--meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch31
-rw-r--r--meta-python/recipes-devtools/python/python3-pybind11_2.10.0.bb (renamed from meta-python/recipes-devtools/python/python3-pybind11_2.9.2.bb)4
2 files changed, 2 insertions, 33 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
deleted file mode 100644
index 761422e07e..0000000000
--- a/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 2e9318f7a70699eed239aee6301d1d0bbd2457ee Mon Sep 17 00:00:00 2001
2From: Philip Balister <philip@balister.org>
3Date: Fri, 10 Jul 2020 10:14:59 -0400
4Subject: [PATCH] Do not check pointer size when cross compiling.
5
6It is reasonable to build for 32 machine on a 64 bit build machine. Prevents:
7| CMake Error at tools/FindPythonLibsNew.cmake:127 (message):
8| Python config failure: Python is 64-bit, chosen compiler is 32-bit
9
10Signed-off-by: Philip Balister <philip@balister.org>
11Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
12---
13 tools/FindPythonLibsNew.cmake | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/tools/FindPythonLibsNew.cmake b/tools/FindPythonLibsNew.cmake
17index 3605aebc..67f4d4a0 100644
18--- a/tools/FindPythonLibsNew.cmake
19+++ b/tools/FindPythonLibsNew.cmake
20@@ -156,7 +156,7 @@ list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH)
21
22 # Make sure the Python has the same pointer-size as the chosen compiler
23 # Skip if CMAKE_SIZEOF_VOID_P is not defined
24-if(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}"))
26 if(PythonLibsNew_FIND_REQUIRED)
27 math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8")
28 math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
29--
302.17.1
31
diff --git a/meta-python/recipes-devtools/python/python3-pybind11_2.9.2.bb b/meta-python/recipes-devtools/python/python3-pybind11_2.10.0.bb
index 433bfd60e8..66aefac3d6 100644
--- a/meta-python/recipes-devtools/python/python3-pybind11_2.9.2.bb
+++ b/meta-python/recipes-devtools/python/python3-pybind11_2.10.0.bb
@@ -7,9 +7,9 @@ DEPENDS = "boost"
7 7
8SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https \ 8SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https \
9 file://0001-Do-not-strip-binaries.patch \ 9 file://0001-Do-not-strip-binaries.patch \
10 file://0001-Do-not-check-pointer-size-when-cross-compiling.patch \
11" 10"
12SRCREV = "914c06fb252b6cc3727d0eedab6736e88a3fcb01" 11
12SRCREV = "aa304c9c7d725ffb9d10af08a3b34cb372307020"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15