diff options
| author | Angelo Compagnucci <angelo.compagnucci@gmail.com> | 2016-07-06 22:07:57 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-07-06 22:21:34 +0200 |
| commit | 5e3b154243a7c3bb77659a3564b62e2989d59415 (patch) | |
| tree | 0fedf59869b6bb08c2618b0fe525e34a8925e92b | |
| parent | ac4471d09f11231d6696995373088095409b0a0c (diff) | |
| download | buildroot-5e3b154243a7c3bb77659a3564b62e2989d59415.tar.gz buildroot-5e3b154243a7c3bb77659a3564b62e2989d59415.zip | |
package/python-pillow: fix wrong install step
This patch changes PYTHON_PILLOW_INSTALL_TARGET_CMDS to actually
install pillow in target directory instead of host.
While at it, it also fixes the version for the hash, and uses the more
conventional "define ... endef" construct to define variables in
python-pillow.mk.
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/python-pillow/python-pillow.hash | 2 | ||||
| -rw-r--r-- | package/python-pillow/python-pillow.mk | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 033692d4c4..bf7828dbd0 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,4 +1,4 @@ # https://pypi.python.org/pypi?:action=show_md5&digest=b5a15b03bf402fe254636c015fcf04da md5 b5a15b03bf402fe254636c015fcf04da Pillow-3.3.0.tar.gz # sha256 locally computed -sha256 031e7c9c885a4f343d1ad366c7fd2340449dc70318acb4a28d6411994f0accd1 Pillow-3.2.0.tar.gz +sha256 031e7c9c885a4f343d1ad366c7fd2340449dc70318acb4a28d6411994f0accd1 Pillow-3.3.0.tar.gz diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 84d6e65d68..619c55b865 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -54,11 +54,20 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-zlib endif -PYTHON_PILLOW_BUILD_CMDS = cd $(PYTHON_PILLOW_BUILDDIR); \ +define PYTHON_PILLOW_BUILD_CMDS + cd $(PYTHON_PILLOW_BUILDDIR); \ $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) +endef -PYTHON_PILLOW_INSTALL_TARGET_CMDS = $(PYTHON_PILLOW_BUILD_CMDS) install +define PYTHON_PILLOW_INSTALL_TARGET_CMDS + cd $(PYTHON_PILLOW_BUILDDIR); \ + $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ + $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ + $(PYTHON_PILLOW_BUILD_OPTS) install \ + $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ + $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) +endef $(eval $(python-package)) |
