Message ID | 20190920163849.8124-2-bernd.kuhls@t-online.de |
---|---|
State | Changes Requested |
Headers | show |
Series | package/{mesa3d, mesa3d-headers}: bump version to 19.1.7 | expand |
On 20/09/2019 18:38, Bernd Kuhls wrote: > From: Romain Naour <romain.naour@smile.fr> > > host-python3-mako will be used by python 3 only script used in the > build system of mesa3d package. > > There is no way to force building host-oython-mako for python2 and > python3 [1]. > > [1] http://patchwork.ozlabs.org/patch/1084248/ > > Signed-off-by: Romain Naour <romain.naour@smile.fr> > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > package/python-mako/python-mako.mk | 2 ++ > package/python3-mako/python3-mako.hash | 1 + > package/python3-mako/python3-mako.mk | 21 +++++++++++++++++++++ > 3 files changed, 24 insertions(+) > create mode 120000 package/python3-mako/python3-mako.hash > create mode 100644 package/python3-mako/python3-mako.mk > > diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk > index 0d06dc4986..f8478cf031 100644 > --- a/package/python-mako/python-mako.mk > +++ b/package/python-mako/python-mako.mk > @@ -4,6 +4,8 @@ > # > ################################################################################ > > +# Please keep in sync with > +# package/python3-mako/python3-mako.mk > PYTHON_MAKO_VERSION = 1.0.6 > PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz > PYTHON_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e > diff --git a/package/python3-mako/python3-mako.hash b/package/python3-mako/python3-mako.hash > new file mode 120000 > index 0000000000..068be91fb0 > --- /dev/null > +++ b/package/python3-mako/python3-mako.hash > @@ -0,0 +1 @@ > +../python-mako/python-mako.hash > \ No newline at end of file > diff --git a/package/python3-mako/python3-mako.mk b/package/python3-mako/python3-mako.mk > new file mode 100644 > index 0000000000..41249bb040 > --- /dev/null > +++ b/package/python3-mako/python3-mako.mk > @@ -0,0 +1,21 @@ > +################################################################################ > +# > +# python3-mako > +# > +################################################################################ > + > +# Please keep in sync with > +# package/python-mako/python-mako.mk > +PYTHON3_MAKO_VERSION = 1.0.6 > +PYTHON3_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz > +PYTHON3_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e > +PYTHON3_MAKO_SETUP_TYPE = setuptools > +PYTHON3_MAKO_LICENSE = MIT > +PYTHON3_MAKO_LICENSE_FILES = LICENSE > +HOST_PYTHON3_MAKO_DL_SUBDIR = python-mako > +HOST_PYTHON3_MAKO_NEEDS_HOST_PYTHON = python3 > + > +# In host build, setup.py tries to download markupsafe if it is not installed > +HOST_PYTHON3_MAKO_DEPENDENCIES = host-python-markupsafe Does this really work? If no python or python2 is installed on the target, then this will only build for python2... I've tried it and setup doesn't seem to fail if markupsafe isn't installed at all. Possibly this is something that is no longer true, and you just blindly copied it from the original python-mako package. Regards, Arnout > + > +$(eval $(host-python-package)) >
Hi Arnout, Thanks for the review of this series :) Le 21/09/2019 à 16:54, Arnout Vandecappelle a écrit : > > > On 20/09/2019 18:38, Bernd Kuhls wrote: >> From: Romain Naour <romain.naour@smile.fr> >> >> host-python3-mako will be used by python 3 only script used in the >> build system of mesa3d package. >> >> There is no way to force building host-oython-mako for python2 and >> python3 [1]. >> >> [1] http://patchwork.ozlabs.org/patch/1084248/ >> >> Signed-off-by: Romain Naour <romain.naour@smile.fr> >> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> >> --- >> package/python-mako/python-mako.mk | 2 ++ >> package/python3-mako/python3-mako.hash | 1 + >> package/python3-mako/python3-mako.mk | 21 +++++++++++++++++++++ >> 3 files changed, 24 insertions(+) >> create mode 120000 package/python3-mako/python3-mako.hash >> create mode 100644 package/python3-mako/python3-mako.mk >> >> diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk >> index 0d06dc4986..f8478cf031 100644 >> --- a/package/python-mako/python-mako.mk >> +++ b/package/python-mako/python-mako.mk >> @@ -4,6 +4,8 @@ >> # >> ################################################################################ >> >> +# Please keep in sync with >> +# package/python3-mako/python3-mako.mk >> PYTHON_MAKO_VERSION = 1.0.6 >> PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz >> PYTHON_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e >> diff --git a/package/python3-mako/python3-mako.hash b/package/python3-mako/python3-mako.hash >> new file mode 120000 >> index 0000000000..068be91fb0 >> --- /dev/null >> +++ b/package/python3-mako/python3-mako.hash >> @@ -0,0 +1 @@ >> +../python-mako/python-mako.hash >> \ No newline at end of file >> diff --git a/package/python3-mako/python3-mako.mk b/package/python3-mako/python3-mako.mk >> new file mode 100644 >> index 0000000000..41249bb040 >> --- /dev/null >> +++ b/package/python3-mako/python3-mako.mk >> @@ -0,0 +1,21 @@ >> +################################################################################ >> +# >> +# python3-mako >> +# >> +################################################################################ >> + >> +# Please keep in sync with >> +# package/python-mako/python-mako.mk >> +PYTHON3_MAKO_VERSION = 1.0.6 >> +PYTHON3_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz >> +PYTHON3_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e >> +PYTHON3_MAKO_SETUP_TYPE = setuptools >> +PYTHON3_MAKO_LICENSE = MIT >> +PYTHON3_MAKO_LICENSE_FILES = LICENSE >> +HOST_PYTHON3_MAKO_DL_SUBDIR = python-mako >> +HOST_PYTHON3_MAKO_NEEDS_HOST_PYTHON = python3 >> + >> +# In host build, setup.py tries to download markupsafe if it is not installed >> +HOST_PYTHON3_MAKO_DEPENDENCIES = host-python-markupsafe > > Does this really work? If no python or python2 is installed on the target, then > this will only build for python2... > > I've tried it and setup doesn't seem to fail if markupsafe isn't installed at all. > > Possibly this is something that is no longer true, and you just blindly copied > it from the original python-mako package. Indeed, it would require host-python3-markupsafe in this case... But since python3-mako doesn't seems to require it, you probably right :) Best regards, Romain > > Regards, > Arnout > >> + >> +$(eval $(host-python-package)) >>
diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 0d06dc4986..f8478cf031 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -4,6 +4,8 @@ # ################################################################################ +# Please keep in sync with +# package/python3-mako/python3-mako.mk PYTHON_MAKO_VERSION = 1.0.6 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz PYTHON_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e diff --git a/package/python3-mako/python3-mako.hash b/package/python3-mako/python3-mako.hash new file mode 120000 index 0000000000..068be91fb0 --- /dev/null +++ b/package/python3-mako/python3-mako.hash @@ -0,0 +1 @@ +../python-mako/python-mako.hash \ No newline at end of file diff --git a/package/python3-mako/python3-mako.mk b/package/python3-mako/python3-mako.mk new file mode 100644 index 0000000000..41249bb040 --- /dev/null +++ b/package/python3-mako/python3-mako.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# python3-mako +# +################################################################################ + +# Please keep in sync with +# package/python-mako/python-mako.mk +PYTHON3_MAKO_VERSION = 1.0.6 +PYTHON3_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz +PYTHON3_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e +PYTHON3_MAKO_SETUP_TYPE = setuptools +PYTHON3_MAKO_LICENSE = MIT +PYTHON3_MAKO_LICENSE_FILES = LICENSE +HOST_PYTHON3_MAKO_DL_SUBDIR = python-mako +HOST_PYTHON3_MAKO_NEEDS_HOST_PYTHON = python3 + +# In host build, setup.py tries to download markupsafe if it is not installed +HOST_PYTHON3_MAKO_DEPENDENCIES = host-python-markupsafe + +$(eval $(host-python-package))