| Message ID | 20241031224026.359215-1-james.hilliard1@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/python-pillow: set new build options | expand |
On 31/10/2024 23:40, James Hilliard wrote: > Explicitly set new imagequant raqm and zlib build options. > I added a Fixes tag for this one as well. Applied to master, thanks. Regards, Arnout > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > --- > package/python-pillow/python-pillow.mk | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk > index e87c817c68..4f4d2ec933 100644 > --- a/package/python-pillow/python-pillow.mk > +++ b/package/python-pillow/python-pillow.mk > @@ -14,7 +14,10 @@ PYTHON_PILLOW_CPE_ID_PRODUCT = pillow > PYTHON_PILLOW_SETUP_TYPE = setuptools > > PYTHON_PILLOW_DEPENDENCIES = host-pkgconf > -PYTHON_PILLOW_BUILD_OPTS = -Cplatform-guessing=disable > +PYTHON_PILLOW_BUILD_OPTS = \ > + -Cplatform-guessing=disable \ > + -Cimagequant=disable \ > + -Craqm=disable > > ifeq ($(BR2_PACKAGE_FREETYPE),y) > PYTHON_PILLOW_DEPENDENCIES += freetype > @@ -70,4 +73,11 @@ else > PYTHON_PILLOW_BUILD_OPTS += -Cwebp=disable -Cwebpmux=disable > endif > > +ifeq ($(BR2_PACKAGE_ZLIB),y) > +PYTHON_PILLOW_DEPENDENCIES += zlib > +PYTHON_PILLOW_BUILD_OPTS += -Czlib=enable > +else > +PYTHON_PILLOW_BUILD_OPTS += -Czlib=disable > +endif > + > $(eval $(python-package))
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index e87c817c68..4f4d2ec933 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -14,7 +14,10 @@ PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools PYTHON_PILLOW_DEPENDENCIES = host-pkgconf -PYTHON_PILLOW_BUILD_OPTS = -Cplatform-guessing=disable +PYTHON_PILLOW_BUILD_OPTS = \ + -Cplatform-guessing=disable \ + -Cimagequant=disable \ + -Craqm=disable ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype @@ -70,4 +73,11 @@ else PYTHON_PILLOW_BUILD_OPTS += -Cwebp=disable -Cwebpmux=disable endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +PYTHON_PILLOW_DEPENDENCIES += zlib +PYTHON_PILLOW_BUILD_OPTS += -Czlib=enable +else +PYTHON_PILLOW_BUILD_OPTS += -Czlib=disable +endif + $(eval $(python-package))
Explicitly set new imagequant raqm and zlib build options. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- package/python-pillow/python-pillow.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)