Skip to content

Commit 2d0b13b

Browse files
committed
Swapped config key and value
1 parent 8780772 commit 2d0b13b

2 files changed

Lines changed: 38 additions & 15 deletions

File tree

_custom_build/backend.py

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,37 @@
77
class _CustomBuildMetaBackend(_BuildMetaBackend):
88
def run_setup(self, setup_script="setup.py"):
99
if self.config_settings:
10-
flags = []
11-
for key in ("enable", "disable", "vendor"):
10+
11+
def config_has(key, value):
1212
settings = self.config_settings.get(key)
1313
if settings:
1414
if not isinstance(settings, list):
1515
settings = [settings]
16-
for value in settings:
17-
flags.append("--" + key + "-" + value)
16+
return value in settings
17+
18+
flags = []
19+
for dependency in (
20+
"zlib",
21+
"jpeg",
22+
"tiff",
23+
"freetype",
24+
"raqm",
25+
"lcms",
26+
"webp",
27+
"webpmux",
28+
"jpeg2000",
29+
"imagequant",
30+
"xcb",
31+
):
32+
if config_has(dependency, "enable"):
33+
flags.append("--enable-" + dependency)
34+
elif config_has(dependency, "disable"):
35+
flags.append("--disable-" + dependency)
36+
for dependency in ("raqm", "fribidi"):
37+
if config_has(dependency, "vendor"):
38+
flags.append("--vendor-" + dependency)
39+
if self.config_settings.get("platform-guessing") == "disable":
40+
flags.append("--disable-platform-guessing")
1841
if self.config_settings.get("debug") == "true":
1942
flags.append("--debug")
2043
if flags:

docs/installation.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -380,28 +380,28 @@ Build Options
380380
using a setting of 1. By default, it uses 4 CPUs, or if 4 are not
381381
available, as many as are present.
382382

383-
* Config settings: ``-C disable=zlib``, ``-C disable=jpeg``,
384-
``-C disable=tiff``, ``-C disable=freetype``, ``-C disable=raqm``,
385-
``-C disable=lcms``, ``-C disable=webp``, ``-C disable=webpmux``,
386-
``-C disable=jpeg2000``, ``-C disable=imagequant``, ``-C disable=xcb``.
383+
* Config settings: ``-C zlib=disable``, ``-C jpeg=disable``,
384+
``-C tiff=disable``, ``-C freetype=disable``, ``-C raqm=disable``,
385+
``-C lcms=disable``, ``-C webp=disable``, ``-C webpmux=disable``,
386+
``-C jpeg2000=disable``, ``-C imagequant=disable``, ``-C xcb=disable``.
387387
Disable building the corresponding feature even if the development
388388
libraries are present on the building machine.
389389

390-
* Config settings: ``-C enable=zlib``, ``-C enable=jpeg``,
391-
``-C enable=tiff``, ``-C enable=freetype``, ``-C enable=raqm``,
392-
``-C enable=lcms``, ``-C enable=webp``, ``-C enable=webpmux``,
393-
``-C enable=jpeg2000``, ``-C enable=imagequant``, ``-C enable=xcb``.
390+
* Config settings: ``-C zlib=enable``, ``-C jpeg=enable``,
391+
``-C tiff=enable``, ``-C freetype=enable``, ``-C raqm=enable``,
392+
``-C lcms=enable``, ``-C webp=enable``, ``-C webpmux=enable``,
393+
``-C jpeg2000=enable``, ``-C imagequant=enable``, ``-C xcb=enable``.
394394
Require that the corresponding feature is built. The build will raise
395395
an exception if the libraries are not found. Webpmux (WebP metadata)
396396
relies on WebP support. Tcl and Tk also must be used together.
397397

398-
* Config settings: ``-C vendor=raqm``, ``-C vendor=fribidi``.
398+
* Config settings: ``-C raqm=vendor``, ``-C fribidi=vendor``.
399399
These flags are used to compile a modified version of libraqm and
400400
a shim that dynamically loads libfribidi at runtime. These are
401401
used to compile the standard Pillow wheels. Compiling libraqm requires
402402
a C99-compliant compiler.
403403

404-
* Build flag: ``-C disable=platform-guessing``. Skips all of the
404+
* Build flag: ``-C platform-guessing=disable``. Skips all of the
405405
platform dependent guessing of include and library directories for
406406
automated build systems that configure the proper paths in the
407407
environment variables (e.g. Buildroot).
@@ -413,7 +413,7 @@ Build Options
413413

414414
Sample usage::
415415

416-
python3 -m pip install --upgrade Pillow -C enable=[feature]
416+
python3 -m pip install --upgrade Pillow -C [feature]=enable
417417

418418
Platform Support
419419
----------------

0 commit comments

Comments
 (0)