projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ac4471d)
package/python-pillow: fix wrong install step
authorAngelo Compagnucci <angelo.compagnucci@gmail.com>
Wed, 6 Jul 2016 20:07:57 +0000 (22:07 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 6 Jul 2016 20:21:34 +0000 (22:21 +0200)
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>
package/python-pillow/python-pillow.hash patch | blob | history
package/python-pillow/python-pillow.mk patch | blob | history

diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index 033692d4c441195107aa0b62154adec19755d2fb..bf7828dbd0600623ddc09cc24779c35d43e3bd02 100644 (file)
--- 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 84d6e65d689ec63b822a201fcead093f79fde350..619c55b865249f793b7b062139d94e5619fd65c4 100644 (file)
--- 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))