| Message ID | 20220725182918.28371-1-guillaume.bressaix@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/python-pybind: bump version to 2.10.0 | expand |
On 25/07/2022 20:29, Guillaume W. Bres wrote: > Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com> > --- > ...nd11-commands.py-support-STAGING_DIR.patch | 20 +++++++++---------- > package/python-pybind/python-pybind.hash | 2 +- > package/python-pybind/python-pybind.mk | 2 +- > 3 files changed, 11 insertions(+), 13 deletions(-) > > diff --git a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch > index 021321a9b7..1f1fede128 100644 > --- a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch > +++ b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch > @@ -1,7 +1,7 @@ > -From bf9f0d619e2e0a424e471a2f9235d26ece5b348c Mon Sep 17 00:00:00 2001 > -From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be> > -Date: Fri, 7 Jan 2022 19:32:18 +0100 > -Subject: [PATCH] pybind11/commands.py: support STAGING_DIR > +From 65ea1a8e1b5fe30c61a3f936a3116c3ce6c3a686 Mon Sep 17 00:00:00 2001 > +From: "Guillaume W. Bres" <guillaume.bressaix@gmail.com> > +Date: Mon, 25 Jul 2022 10:55:27 +0200 > +Subject: [PATCH] pybind11 commands.py support STAGING_DIR Please don't change the author when you refresh a patch. Applied to master with that fixed, thanks. Regards, Arnout > > In Buildroot, we install build-time python scripts in the host directory > (otherwise they can't be run with host python), but when running > @@ -10,18 +10,16 @@ pybind11 --includes it should return the staging directory. > Patch commands.py to use the STAGING_DIR environment variable instead of > the current directory, if it is set. > > -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > -Upstream-Status: N/A, Buildroot specific > +Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com> > --- > pybind11/commands.py | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/pybind11/commands.py b/pybind11/commands.py > -index 11f81d2..8c4876d 100644 > +index a29c8ca..de8a27c 100644 > --- a/pybind11/commands.py > +++ b/pybind11/commands.py > -@@ -1,7 +1,8 @@ > - # -*- coding: utf-8 -*- > +@@ -1,6 +1,7 @@ > import os > > -DIR = os.path.abspath(os.path.dirname(__file__)) > @@ -29,7 +27,7 @@ index 11f81d2..8c4876d 100644 > + os.path.abspath(os.path.dirname(__file__)) > > > - def get_include(user=False): > + def get_include(user: bool = False) -> str: # pylint: disable=unused-argument > -- > -2.31.1 > +1.8.3.1 > > diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash > index d5b4b4829e..b4b3ff94d0 100644 > --- a/package/python-pybind/python-pybind.hash > +++ b/package/python-pybind/python-pybind.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 057fb68dafd972bc13afb855f3b0d8cf0fa1a78ef053e815d9af79be7ff567cb python-pybind-2.9.0.tar.gz > +sha256 eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec python-pybind-2.10.0.tar.gz > # License files, locally calculated > sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE > diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk > index 05fc593346..c5bee3d0a7 100644 > --- a/package/python-pybind/python-pybind.mk > +++ b/package/python-pybind/python-pybind.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PYTHON_PYBIND_VERSION = 2.9.0 > +PYTHON_PYBIND_VERSION = 2.10.0 > PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) > PYTHON_PYBIND_LICENSE = BSD-3-Clause > PYTHON_PYBIND_LICENSE_FILES = LICENSE
diff --git a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch index 021321a9b7..1f1fede128 100644 --- a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch +++ b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch @@ -1,7 +1,7 @@ -From bf9f0d619e2e0a424e471a2f9235d26ece5b348c Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be> -Date: Fri, 7 Jan 2022 19:32:18 +0100 -Subject: [PATCH] pybind11/commands.py: support STAGING_DIR +From 65ea1a8e1b5fe30c61a3f936a3116c3ce6c3a686 Mon Sep 17 00:00:00 2001 +From: "Guillaume W. Bres" <guillaume.bressaix@gmail.com> +Date: Mon, 25 Jul 2022 10:55:27 +0200 +Subject: [PATCH] pybind11 commands.py support STAGING_DIR In Buildroot, we install build-time python scripts in the host directory (otherwise they can't be run with host python), but when running @@ -10,18 +10,16 @@ pybind11 --includes it should return the staging directory. Patch commands.py to use the STAGING_DIR environment variable instead of the current directory, if it is set. -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> -Upstream-Status: N/A, Buildroot specific +Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com> --- pybind11/commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pybind11/commands.py b/pybind11/commands.py -index 11f81d2..8c4876d 100644 +index a29c8ca..de8a27c 100644 --- a/pybind11/commands.py +++ b/pybind11/commands.py -@@ -1,7 +1,8 @@ - # -*- coding: utf-8 -*- +@@ -1,6 +1,7 @@ import os -DIR = os.path.abspath(os.path.dirname(__file__)) @@ -29,7 +27,7 @@ index 11f81d2..8c4876d 100644 + os.path.abspath(os.path.dirname(__file__)) - def get_include(user=False): + def get_include(user: bool = False) -> str: # pylint: disable=unused-argument -- -2.31.1 +1.8.3.1 diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index d5b4b4829e..b4b3ff94d0 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 057fb68dafd972bc13afb855f3b0d8cf0fa1a78ef053e815d9af79be7ff567cb python-pybind-2.9.0.tar.gz +sha256 eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec python-pybind-2.10.0.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index 05fc593346..c5bee3d0a7 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.9.0 +PYTHON_PYBIND_VERSION = 2.10.0 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE
Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com> --- ...nd11-commands.py-support-STAGING_DIR.patch | 20 +++++++++---------- package/python-pybind/python-pybind.hash | 2 +- package/python-pybind/python-pybind.mk | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-)