| Message ID | 20210227100959.28281-1-guillaume.bressaix@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | package/pybind11: new package | expand |
See examples of failures that this new approach fixes: http://autobuild.buildroot.net/results/44c98429a90e2799a92f71e0b70c6b0cc6145867/ http://autobuild.buildroot.net/results/3065c4a240eeed2b62f7c0ba364ed215379e0776/ Guillaume W. Bres Software engineer <guillaume.bressaix@gmail.com> Le sam. 27 févr. 2021 à 11:10, <guillaume.bressaix@gmail.com> a écrit : > From: "Guillaume W. Bres" <guillaume.bressaix@gmail.com> > > Pybind11 is a lightweight header-only library that exposes C++ > types in Python and vice versa, mainly to create Python > bindings of existing C++ code. > > Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com> > --- > > Warning!!: this new package and its internal > BR2_PACKAGE_PYBIND11_WITH_PYTHON option > intends to replace package/python-pybind which is totally broken > since upgrade to v2.6.1 in ->next. > > The python build now requires a previous cmake build: > + python-pybind only is not possible and will not build > by itself > > + python setup.py requires cmake to install > within $(@D) a couple files (in $(@D)/pybind11 exactly) > to properly work. See my message in BR digest 17/02: > <CAJe0E3eQxAZHAe2DN4Qp9k_0czYGsR639+= > bSUaEdyaKm0Keuw@mail.gmail.com> > cc to Thomas, Gwen & Peter, entitled: > "Python-pybind we need to discuss this package" > > => If this package is merged, package/python-pybind is deprecated > > => package/python-pybind v2.6.1+ in ->next must be removed, > python-build by itself cannot work anymore > > Pybind11 is a host only package > > Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com> > --- > DEVELOPERS | 1 + > package/pybind11/Config.in | 25 ++++++++++++++++++++ > package/pybind11/pybind11.hash | 3 +++ > package/pybind11/pybind11.mk | 42 ++++++++++++++++++++++++++++++++++ > 4 files changed, 71 insertions(+) > create mode 100644 package/pybind11/Config.in > create mode 100644 package/pybind11/pybind11.hash > create mode 100644 package/pybind11/pybind11.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index b019fe04d5..98e8b329ed 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1057,6 +1057,7 @@ N: Guillaume William Brs < > guillaume.bressaix@gmail.com> > F: package/libnids/ > F: package/liquid-dsp/ > F: package/pixiewps/ > +F: package/pybind11/ > F: package/python-pybind/ > F: package/reaver/ > > diff --git a/package/pybind11/Config.in b/package/pybind11/Config.in > new file mode 100644 > index 0000000000..883bf8cc09 > --- /dev/null > +++ b/package/pybind11/Config.in > @@ -0,0 +1,25 @@ > +comment "pybind11 needs a toolchain w/ C++, wchar" > + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR > + > +config BR2_PACKAGE_PYBIND11 > + bool "pybind11" > + depends on BR2_INSTALL_LIBSTDCPP # boost > + depends on BR2_USE_WCHAR # boost > + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread > + select BR2_PACKAGE_BOOST > + help > + Pybind11 is a lightweight header-only library that exposes C++ > + types in Python and vice versa, mainly to create Python > + bindings of existing C++ code. > + > + http://pybind11.readthedocs.org/en/master > + > +if BR2_PACKAGE_PYBIND11 > + > +config BR2_PACKAGE_PYBIND11_WITH_PYTHON > + bool "pybind11-python" > + depends on BR2_PACKAGE_PYTHON3 > + help > + Activate support for python-pybind > + > +endif > diff --git a/package/pybind11/pybind11.hash > b/package/pybind11/pybind11.hash > new file mode 100644 > index 0000000000..e703519a22 > --- /dev/null > +++ b/package/pybind11/pybind11.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 8ff2fff22df038f5cd02cea8af56622bc67f5b64534f1b83b9f133b8366acff2 > pybind11-2.6.2.tar.gz > +sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb > LICENSE > diff --git a/package/pybind11/pybind11.mk b/package/pybind11/pybind11.mk > new file mode 100644 > index 0000000000..c8d69e1dd4 > --- /dev/null > +++ b/package/pybind11/pybind11.mk > @@ -0,0 +1,42 @@ > > +################################################################################ > +# > +# pybind11 > +# > > +################################################################################ > + > +PYBIND11_VERSION = 2.6.2 > +PYBIND11_SITE = $(call github,pybind,pybind11,v$(PYBIND11_VERSION)) > +PYBIND11_LICENSE = BSD-3-Clause > +PYBIND11_LICENSE_FILES = LICENSE > +PYBIND11_INSTALL_STAGING = YES > +PYBIND11_SUPPORTS_IN_SOURCE_BUILD = YES > + > +HOST_PYBIND11_CONF_OPTS = \ > + -DBUILD_DOCS=OFF \ > + -DDOWNLOAD_EIGEN=OFF \ > + -DPYTHON=$(TARGET_DIR)/usr/bin/python \ > + -DPYTHON_PREFIX=$(STAGING_DIR)/usr > + > +# pybind11-python support activation > +# this requires the cmake build installed within $(@D) > +ifeq ($(BR2_PACKAGE_PYBIND11_WITH_PYTHON),y) > + > +HOST_PYBIND11_DEPENDENCIES += host-python3 > + > +HOST_PYBIND11_CONF_OPTS += -DCMAKE_INSTALL_PREFIX=$(@D)/pybind11 > + > +define PYBIND11_PYTHON_BUILD > + cd $(@D) && $(HOST_DIR)/bin/python setup.py install > +endef > + > +HOST_PYBIND11_POST_INSTALL_HOOKS += PYBIND11_PYTHON_BUILD > + > +else > + > +HOST_PYBIND11_CONF_OPTS += \ > + -DPYBIND_FINDPYTHON=OFF \ > + -DPYBIND11_NOPYTHON=ON > + > +endif > + > +$(eval $(host-cmake-package)) > -- > 2.20.1 > >
Hi Guillaume, On 27/02/2021 11:09, guillaume.bressaix@gmail.com wrote: > From: "Guillaume W. Bres" <guillaume.bressaix@gmail.com> > > Pybind11 is a lightweight header-only library that exposes C++ > types in Python and vice versa, mainly to create Python > bindings of existing C++ code. It helps a lot if you add Fixes: lines with the autobuilder failures. Since we have a backlog of 400+ patches, new packages get ignored pretty easily. > Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com> > --- > > Warning!!: this new package and its internal > BR2_PACKAGE_PYBIND11_WITH_PYTHON option > intends to replace package/python-pybind which is totally broken > since upgrade to v2.6.1 in ->next. It would be good to also add a patch that removes python-pybind then. For that patch, don't forget to add a conversion in Config.in.legacy. > > The python build now requires a previous cmake build: > + python-pybind only is not possible and will not build > by itself > > + python setup.py requires cmake to install I see that on the first version of this package, you got feedback to not use cmake. That was clearly a mistake :-) > within $(@D) a couple files (in $(@D)/pybind11 exactly) > to properly work. See my message in BR digest 17/02: > <CAJe0E3eQxAZHAe2DN4Qp9k_0czYGsR639+=bSUaEdyaKm0Keuw@mail.gmail.com> > cc to Thomas, Gwen & Peter, entitled: > "Python-pybind we need to discuss this package" > > => If this package is merged, package/python-pybind is deprecated > > => package/python-pybind v2.6.1+ in ->next must be removed, > python-build by itself cannot work anymore I guess we can keep it in 2021.02 right? It still builds there? > > Pybind11 is a host only package I don't get it... This is supposed to replace python-pybind, which is a target package. How is that ever going to work? > > Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com> > --- > DEVELOPERS | 1 + > package/pybind11/Config.in | 25 ++++++++++++++++++++ > package/pybind11/pybind11.hash | 3 +++ > package/pybind11/pybind11.mk | 42 ++++++++++++++++++++++++++++++++++ > 4 files changed, 71 insertions(+) > create mode 100644 package/pybind11/Config.in > create mode 100644 package/pybind11/pybind11.hash > create mode 100644 package/pybind11/pybind11.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index b019fe04d5..98e8b329ed 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1057,6 +1057,7 @@ N: Guillaume William Brs <guillaume.bressaix@gmail.com> > F: package/libnids/ > F: package/liquid-dsp/ > F: package/pixiewps/ > +F: package/pybind11/ > F: package/python-pybind/ > F: package/reaver/ > > diff --git a/package/pybind11/Config.in b/package/pybind11/Config.in > new file mode 100644 > index 0000000000..883bf8cc09 > --- /dev/null > +++ b/package/pybind11/Config.in > @@ -0,0 +1,25 @@ > +comment "pybind11 needs a toolchain w/ C++, wchar" > + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR > + > +config BR2_PACKAGE_PYBIND11 Host packages should be called BR2_PACKAGE_HOST_PYBIND11. But I think you actually meant to have a target package... Anyway for a host package we normally don't even want a Config.in symbol, and it should only exist if it is a dependency of some other package. We only want Config.in symbols for host packages that you might want to use in a post-build script (like genimage). But again, I think you actually meant to have a target package. > + bool "pybind11" > + depends on BR2_INSTALL_LIBSTDCPP # boost The # boost comment is not needed, since this package is a C++ package itself. > + depends on BR2_USE_WCHAR # boost > + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread > + select BR2_PACKAGE_BOOST The README pretty explicitly says that the goal of the project is to avoid a dependency on Boost. Are you sure this dependency is needed? On the other hand, the package is intended to create python-C++ bindings, so I think there should be a dependency on python. The README also says that it depends on C++11 features, so you'll need depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 (+ comment) > + help > + Pybind11 is a lightweight header-only library that exposes C++ > + types in Python and vice versa, mainly to create Python > + bindings of existing C++ code. > + > + http://pybind11.readthedocs.org/en/master > + > +if BR2_PACKAGE_PYBIND11 > + > +config BR2_PACKAGE_PYBIND11_WITH_PYTHON > + bool "pybind11-python" > + depends on BR2_PACKAGE_PYTHON3 > + help > + Activate support for python-pybind I suppose the idea is to choose between "expose python objects in C++" and "expose C++ objects in python". The help text doesn't really tell me which of the two this option enables... Can you clarify that? I think the main package help text should explain that only the headers are installed unless _WITH_PYTHON is enabled. > + > +endif > diff --git a/package/pybind11/pybind11.hash b/package/pybind11/pybind11.hash > new file mode 100644 > index 0000000000..e703519a22 > --- /dev/null > +++ b/package/pybind11/pybind11.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 8ff2fff22df038f5cd02cea8af56622bc67f5b64534f1b83b9f133b8366acff2 pybind11-2.6.2.tar.gz > +sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE > diff --git a/package/pybind11/pybind11.mk b/package/pybind11/pybind11.mk > new file mode 100644 > index 0000000000..c8d69e1dd4 > --- /dev/null > +++ b/package/pybind11/pybind11.mk > @@ -0,0 +1,42 @@ > +################################################################################ > +# > +# pybind11 > +# > +################################################################################ > + > +PYBIND11_VERSION = 2.6.2 > +PYBIND11_SITE = $(call github,pybind,pybind11,v$(PYBIND11_VERSION)) > +PYBIND11_LICENSE = BSD-3-Clause > +PYBIND11_LICENSE_FILES = LICENSE > +PYBIND11_INSTALL_STAGING = YES > +PYBIND11_SUPPORTS_IN_SOURCE_BUILD = YES This is the default, it only needs to be set to NO for packages that don't support in-source build. > + > +HOST_PYBIND11_CONF_OPTS = \ > + -DBUILD_DOCS=OFF \ > + -DDOWNLOAD_EIGEN=OFF \ This sounds like there should also be a (perhaps optional) dependency on eigen? Ah, no, it's only used for tests - better mention that in the commit message. > + -DPYTHON=$(TARGET_DIR)/usr/bin/python \ This means you *definitely* need a dependency on python. However, I think it is only needed if we actually create the python bindings, i.e. if BR2_PACKAGE_PYBIND11_WITH_PYTHON is turned on. However, I don't see this used anywhere in the cmake code. I *do* see PYTHON_EXECUTABLE - isn't that what you meant? Hm, no, that can't be, because it is used to actually execute some python code, so it shouldn't point to the target python. In fact, it never makes sense to point to the target python - if it is actually used for something on the target, the $(TARGET_DIR) part should not be there at all... Also, this should probably be python3 and not plain python. > + -DPYTHON_PREFIX=$(STAGING_DIR)/usr > + > +# pybind11-python support activation > +# this requires the cmake build installed within $(@D) > +ifeq ($(BR2_PACKAGE_PYBIND11_WITH_PYTHON),y) > + > +HOST_PYBIND11_DEPENDENCIES += host-python3 > + > +HOST_PYBIND11_CONF_OPTS += -DCMAKE_INSTALL_PREFIX=$(@D)/pybind11 > + > +define PYBIND11_PYTHON_BUILD > + cd $(@D) && $(HOST_DIR)/bin/python setup.py install You really want to use the full cross-build environment here, like is done in a python package. We also want to split the build and the install step. Look at jailhouse for an example. Regards, Arnout > +endef > + > +HOST_PYBIND11_POST_INSTALL_HOOKS += PYBIND11_PYTHON_BUILD > + > +else > + > +HOST_PYBIND11_CONF_OPTS += \ > + -DPYBIND_FINDPYTHON=OFF \ > + -DPYBIND11_NOPYTHON=ON > + > +endif > + > +$(eval $(host-cmake-package)) >
Arnout, thank you for the patch review, I am working on total different things but will soon get back to this topic >I went back to that patch and commented on it. It indeed looks like a better approach Yes, it would allow any use case of "pybind" and would unlock the impossibility to upgrade at the moment > It would be good to also add a patch that removes python-pybind then. For that > patch, don't forget to add a conversion in Config.in.legacy. I never had to do that, I'll try my best. Which version of BR should I mention in "removed in xxx"? I assume the next release, so that means I should push my patch to ->next?? > you got feedback to not use cmake. That was clearly a mistake :-) Wrong or right, either way the problem is the current philosophy has this package completely stuck >I don't get it... This is supposed to replace python-pybind, which is a target >package. How is that ever going to work? > Host packages should be called BR2_PACKAGE_HOST_PYBIND11. But I think you >actually meant to have a target package... that's correct I will take all your reviews into account >I hear what you're saying. We're really struggling to improve the situation, >but with the huge backlog of patches we have, we're barely keeping afloat with >just the easy security updates and build fixes. There are not many "difficult" >patches that get our time (it took me more than an hour to review the pybind11 >patch). I can only imagine the amount of work you guys are facing. Sorry for my late reply but I don't forget you guys and this topic, i'm focused on so many things, I need to be 100% on a topic, especially when I need to take lots of info/reviews into account I keep you updated and will submit a review of this patch soon Guillaume W. Bres Software engineer <guillaume.bressaix@gmail.com> Le sam. 1 mai 2021 à 17:43, Arnout Vandecappelle <arnout@mind.be> a écrit : > Hi Guillaume, > > On 27/02/2021 11:09, guillaume.bressaix@gmail.com wrote: > > From: "Guillaume W. Bres" <guillaume.bressaix@gmail.com> > > > > Pybind11 is a lightweight header-only library that exposes C++ > > types in Python and vice versa, mainly to create Python > > bindings of existing C++ code. > > It helps a lot if you add Fixes: lines with the autobuilder failures. > Since we > have a backlog of 400+ patches, new packages get ignored pretty easily. > > > > Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com> > > --- > > > > Warning!!: this new package and its internal > > BR2_PACKAGE_PYBIND11_WITH_PYTHON option > > intends to replace package/python-pybind which is totally broken > > since upgrade to v2.6.1 in ->next. > > It would be good to also add a patch that removes python-pybind then. For > that > patch, don't forget to add a conversion in Config.in.legacy. > > > > > The python build now requires a previous cmake build: > > + python-pybind only is not possible and will not build > > by itself > > > > + python setup.py requires cmake to install > > I see that on the first version of this package, you got feedback to not > use > cmake. That was clearly a mistake :-) > > > within $(@D) a couple files (in $(@D)/pybind11 exactly) > > to properly work. See my message in BR digest 17/02: > > <CAJe0E3eQxAZHAe2DN4Qp9k_0czYGsR639+= > bSUaEdyaKm0Keuw@mail.gmail.com> > > cc to Thomas, Gwen & Peter, entitled: > > "Python-pybind we need to discuss this package" > > > > => If this package is merged, package/python-pybind is deprecated > > > > => package/python-pybind v2.6.1+ in ->next must be removed, > > python-build by itself cannot work anymore > > I guess we can keep it in 2021.02 right? It still builds there? > > > > > Pybind11 is a host only package > > I don't get it... This is supposed to replace python-pybind, which is a > target > package. How is that ever going to work? > > > > > Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com> > > --- > > DEVELOPERS | 1 + > > package/pybind11/Config.in | 25 ++++++++++++++++++++ > > package/pybind11/pybind11.hash | 3 +++ > > package/pybind11/pybind11.mk | 42 ++++++++++++++++++++++++++++++++++ > > 4 files changed, 71 insertions(+) > > create mode 100644 package/pybind11/Config.in > > create mode 100644 package/pybind11/pybind11.hash > > create mode 100644 package/pybind11/pybind11.mk > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index b019fe04d5..98e8b329ed 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -1057,6 +1057,7 @@ N: Guillaume William Brs < > guillaume.bressaix@gmail.com> > > F: package/libnids/ > > F: package/liquid-dsp/ > > F: package/pixiewps/ > > +F: package/pybind11/ > > F: package/python-pybind/ > > F: package/reaver/ > > > > diff --git a/package/pybind11/Config.in b/package/pybind11/Config.in > > new file mode 100644 > > index 0000000000..883bf8cc09 > > --- /dev/null > > +++ b/package/pybind11/Config.in > > @@ -0,0 +1,25 @@ > > +comment "pybind11 needs a toolchain w/ C++, wchar" > > + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR > > + > > +config BR2_PACKAGE_PYBIND11 > > Host packages should be called BR2_PACKAGE_HOST_PYBIND11. But I think you > actually meant to have a target package... Anyway for a host package we > normally > don't even want a Config.in symbol, and it should only exist if it is a > dependency of some other package. We only want Config.in symbols for host > packages that you might want to use in a post-build script (like genimage). > > But again, I think you actually meant to have a target package. > > > + bool "pybind11" > > + depends on BR2_INSTALL_LIBSTDCPP # boost > > The # boost comment is not needed, since this package is a C++ package > itself. > > > + depends on BR2_USE_WCHAR # boost > > + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread > > + select BR2_PACKAGE_BOOST > > The README pretty explicitly says that the goal of the project is to > avoid a > dependency on Boost. Are you sure this dependency is needed? > > On the other hand, the package is intended to create python-C++ bindings, > so I > think there should be a dependency on python. > > The README also says that it depends on C++11 features, so you'll need > > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 > > (+ comment) > > > + help > > + Pybind11 is a lightweight header-only library that exposes C++ > > + types in Python and vice versa, mainly to create Python > > + bindings of existing C++ code. > > + > > + http://pybind11.readthedocs.org/en/master > > + > > +if BR2_PACKAGE_PYBIND11 > > + > > +config BR2_PACKAGE_PYBIND11_WITH_PYTHON > > + bool "pybind11-python" > > + depends on BR2_PACKAGE_PYTHON3 > > + help > > + Activate support for python-pybind > > I suppose the idea is to choose between "expose python objects in C++" and > "expose C++ objects in python". The help text doesn't really tell me which > of > the two this option enables... Can you clarify that? I think the main > package > help text should explain that only the headers are installed unless > _WITH_PYTHON > is enabled. > > > + > > +endif > > diff --git a/package/pybind11/pybind11.hash > b/package/pybind11/pybind11.hash > > new file mode 100644 > > index 0000000000..e703519a22 > > --- /dev/null > > +++ b/package/pybind11/pybind11.hash > > @@ -0,0 +1,3 @@ > > +# Locally calculated > > +sha256 > 8ff2fff22df038f5cd02cea8af56622bc67f5b64534f1b83b9f133b8366acff2 > pybind11-2.6.2.tar.gz > > +sha256 > 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE > > diff --git a/package/pybind11/pybind11.mk b/package/pybind11/pybind11.mk > > new file mode 100644 > > index 0000000000..c8d69e1dd4 > > --- /dev/null > > +++ b/package/pybind11/pybind11.mk > > @@ -0,0 +1,42 @@ > > > +################################################################################ > > +# > > +# pybind11 > > +# > > > +################################################################################ > > + > > +PYBIND11_VERSION = 2.6.2 > > +PYBIND11_SITE = $(call github,pybind,pybind11,v$(PYBIND11_VERSION)) > > +PYBIND11_LICENSE = BSD-3-Clause > > +PYBIND11_LICENSE_FILES = LICENSE > > +PYBIND11_INSTALL_STAGING = YES > > +PYBIND11_SUPPORTS_IN_SOURCE_BUILD = YES > > This is the default, it only needs to be set to NO for packages that don't > support in-source build. > > > + > > +HOST_PYBIND11_CONF_OPTS = \ > > + -DBUILD_DOCS=OFF \ > > + -DDOWNLOAD_EIGEN=OFF \ > > This sounds like there should also be a (perhaps optional) dependency on > eigen? > Ah, no, it's only used for tests - better mention that in the commit > message. > > > + -DPYTHON=$(TARGET_DIR)/usr/bin/python \ > > This means you *definitely* need a dependency on python. However, I think > it is > only needed if we actually create the python bindings, i.e. if > BR2_PACKAGE_PYBIND11_WITH_PYTHON is turned on. > > However, I don't see this used anywhere in the cmake code. I *do* see > PYTHON_EXECUTABLE - isn't that what you meant? Hm, no, that can't be, > because it > is used to actually execute some python code, so it shouldn't point to the > target python. In fact, it never makes sense to point to the target python > - if > it is actually used for something on the target, the $(TARGET_DIR) part > should > not be there at all... > > Also, this should probably be python3 and not plain python. > > > > + -DPYTHON_PREFIX=$(STAGING_DIR)/usr > > + > > +# pybind11-python support activation > > +# this requires the cmake build installed within $(@D) > > +ifeq ($(BR2_PACKAGE_PYBIND11_WITH_PYTHON),y) > > + > > +HOST_PYBIND11_DEPENDENCIES += host-python3 > > + > > +HOST_PYBIND11_CONF_OPTS += -DCMAKE_INSTALL_PREFIX=$(@D)/pybind11 > > + > > +define PYBIND11_PYTHON_BUILD > > + cd $(@D) && $(HOST_DIR)/bin/python setup.py install > > You really want to use the full cross-build environment here, like is > done in a > python package. We also want to split the build and the install step. Look > at > jailhouse for an example. > > > Regards, > Arnout > > > > +endef > > + > > +HOST_PYBIND11_POST_INSTALL_HOOKS += PYBIND11_PYTHON_BUILD > > + > > +else > > + > > +HOST_PYBIND11_CONF_OPTS += \ > > + -DPYBIND_FINDPYTHON=OFF \ > > + -DPYBIND11_NOPYTHON=ON > > + > > +endif > > + > > +$(eval $(host-cmake-package)) > > >
On 09/05/2021 15:50, Guillaume Bres wrote: > Arnout, > > thank you for the patch review, > I am working on total different things but will soon get back to this topic > >>I went back to that patch and commented on it. It indeed looks like a better > approach > > Yes, it would allow any use case of "pybind" and would unlock > the impossibility to upgrade at the moment > >> It would be good to also add a patch that removes python-pybind then. For that >> patch, don't forget to add a conversion in Config.in.legacy. > > I never had to do that, I'll try my best. > Which version of BR should I mention in "removed in xxx"? > I assume the next release, so that means I should push my patch to ->next?? Yes, please prepare your patch for the `next` branch. There should be a comment "Legacy options removed in 2021.08" added. But don't worry too much about it, we'll fix that while applying if needed. Regards, Arnout [snip]
diff --git a/DEVELOPERS b/DEVELOPERS index b019fe04d5..98e8b329ed 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1057,6 +1057,7 @@ N: Guillaume William Brs <guillaume.bressaix@gmail.com> F: package/libnids/ F: package/liquid-dsp/ F: package/pixiewps/ +F: package/pybind11/ F: package/python-pybind/ F: package/reaver/ diff --git a/package/pybind11/Config.in b/package/pybind11/Config.in new file mode 100644 index 0000000000..883bf8cc09 --- /dev/null +++ b/package/pybind11/Config.in @@ -0,0 +1,25 @@ +comment "pybind11 needs a toolchain w/ C++, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR + +config BR2_PACKAGE_PYBIND11 + bool "pybind11" + depends on BR2_INSTALL_LIBSTDCPP # boost + depends on BR2_USE_WCHAR # boost + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread + select BR2_PACKAGE_BOOST + help + Pybind11 is a lightweight header-only library that exposes C++ + types in Python and vice versa, mainly to create Python + bindings of existing C++ code. + + http://pybind11.readthedocs.org/en/master + +if BR2_PACKAGE_PYBIND11 + +config BR2_PACKAGE_PYBIND11_WITH_PYTHON + bool "pybind11-python" + depends on BR2_PACKAGE_PYTHON3 + help + Activate support for python-pybind + +endif diff --git a/package/pybind11/pybind11.hash b/package/pybind11/pybind11.hash new file mode 100644 index 0000000000..e703519a22 --- /dev/null +++ b/package/pybind11/pybind11.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 8ff2fff22df038f5cd02cea8af56622bc67f5b64534f1b83b9f133b8366acff2 pybind11-2.6.2.tar.gz +sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/pybind11/pybind11.mk b/package/pybind11/pybind11.mk new file mode 100644 index 0000000000..c8d69e1dd4 --- /dev/null +++ b/package/pybind11/pybind11.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# pybind11 +# +################################################################################ + +PYBIND11_VERSION = 2.6.2 +PYBIND11_SITE = $(call github,pybind,pybind11,v$(PYBIND11_VERSION)) +PYBIND11_LICENSE = BSD-3-Clause +PYBIND11_LICENSE_FILES = LICENSE +PYBIND11_INSTALL_STAGING = YES +PYBIND11_SUPPORTS_IN_SOURCE_BUILD = YES + +HOST_PYBIND11_CONF_OPTS = \ + -DBUILD_DOCS=OFF \ + -DDOWNLOAD_EIGEN=OFF \ + -DPYTHON=$(TARGET_DIR)/usr/bin/python \ + -DPYTHON_PREFIX=$(STAGING_DIR)/usr + +# pybind11-python support activation +# this requires the cmake build installed within $(@D) +ifeq ($(BR2_PACKAGE_PYBIND11_WITH_PYTHON),y) + +HOST_PYBIND11_DEPENDENCIES += host-python3 + +HOST_PYBIND11_CONF_OPTS += -DCMAKE_INSTALL_PREFIX=$(@D)/pybind11 + +define PYBIND11_PYTHON_BUILD + cd $(@D) && $(HOST_DIR)/bin/python setup.py install +endef + +HOST_PYBIND11_POST_INSTALL_HOOKS += PYBIND11_PYTHON_BUILD + +else + +HOST_PYBIND11_CONF_OPTS += \ + -DPYBIND_FINDPYTHON=OFF \ + -DPYBIND11_NOPYTHON=ON + +endif + +$(eval $(host-cmake-package))