From 8eb19057808cb54031509f4a77fce04b82a6bd6d Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Fri, 26 Aug 2022 10:09:10 -0400 Subject: 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 Signed-off-by: Khem Raj --- ...t-check-pointer-size-when-cross-compiling.patch | 31 ----------------- .../python/python3-pybind11_2.10.0.bb | 39 ++++++++++++++++++++++ .../python/python3-pybind11_2.9.2.bb | 39 ---------------------- 3 files changed, 39 insertions(+), 70 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch create mode 100644 meta-python/recipes-devtools/python/python3-pybind11_2.10.0.bb delete mode 100644 meta-python/recipes-devtools/python/python3-pybind11_2.9.2.bb (limited to 'meta-python') 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 @@ -From 2e9318f7a70699eed239aee6301d1d0bbd2457ee Mon Sep 17 00:00:00 2001 -From: Philip Balister -Date: Fri, 10 Jul 2020 10:14:59 -0400 -Subject: [PATCH] Do not check pointer size when cross compiling. - -It is reasonable to build for 32 machine on a 64 bit build machine. Prevents: -| CMake Error at tools/FindPythonLibsNew.cmake:127 (message): -| Python config failure: Python is 64-bit, chosen compiler is 32-bit - -Signed-off-by: Philip Balister -Signed-off-by: Leon Anavi ---- - tools/FindPythonLibsNew.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/FindPythonLibsNew.cmake b/tools/FindPythonLibsNew.cmake -index 3605aebc..67f4d4a0 100644 ---- a/tools/FindPythonLibsNew.cmake -+++ b/tools/FindPythonLibsNew.cmake -@@ -156,7 +156,7 @@ list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH) - - # Make sure the Python has the same pointer-size as the chosen compiler - # Skip if CMAKE_SIZEOF_VOID_P is not defined --if(CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) -+if((NOT CMAKE_CROSSCOMPILING) AND CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) - if(PythonLibsNew_FIND_REQUIRED) - math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8") - math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8") --- -2.17.1 - diff --git a/meta-python/recipes-devtools/python/python3-pybind11_2.10.0.bb b/meta-python/recipes-devtools/python/python3-pybind11_2.10.0.bb new file mode 100644 index 0000000000..66aefac3d6 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pybind11_2.10.0.bb @@ -0,0 +1,39 @@ +SUMMARY = "Seamless operability between C++11 and Python" +HOMEPAGE = "https://github.com/wjakob/pybind11" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f" + +DEPENDS = "boost" + +SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https \ + file://0001-Do-not-strip-binaries.patch \ +" + +SRCREV = "aa304c9c7d725ffb9d10af08a3b34cb372307020" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" + +EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" + +inherit cmake setuptools3 python3native + +PIP_INSTALL_DIST_PATH = "${S}/dist" +PIP_INSTALL_PACKAGE = "pybind11" + +do_configure() { + cmake_do_configure +} + +do_compile() { + setuptools3_do_compile + cmake_do_compile +} + +do_install() { + setuptools3_do_install + cmake_do_install +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pybind11_2.9.2.bb b/meta-python/recipes-devtools/python/python3-pybind11_2.9.2.bb deleted file mode 100644 index 433bfd60e8..0000000000 --- a/meta-python/recipes-devtools/python/python3-pybind11_2.9.2.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Seamless operability between C++11 and Python" -HOMEPAGE = "https://github.com/wjakob/pybind11" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f" - -DEPENDS = "boost" - -SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https \ - file://0001-Do-not-strip-binaries.patch \ - file://0001-Do-not-check-pointer-size-when-cross-compiling.patch \ -" -SRCREV = "914c06fb252b6cc3727d0eedab6736e88a3fcb01" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" - -EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" - -inherit cmake setuptools3 python3native - -PIP_INSTALL_DIST_PATH = "${S}/dist" -PIP_INSTALL_PACKAGE = "pybind11" - -do_configure() { - cmake_do_configure -} - -do_compile() { - setuptools3_do_compile - cmake_do_compile -} - -do_install() { - setuptools3_do_install - cmake_do_install -} - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf