فهرست منبع

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>
Angelo Compagnucci 9 سال پیش
والد
کامیت
5e3b154243
2فایلهای تغییر یافته به همراه12 افزوده شده و 3 حذف شده
  1. 1 1
      package/python-pillow/python-pillow.hash
  2. 11 2
      package/python-pillow/python-pillow.mk

+ 1 - 1
package/python-pillow/python-pillow.hash

@@ -1,4 +1,4 @@
 # https://pypi.python.org/pypi?:action=show_md5&digest=b5a15b03bf402fe254636c015fcf04da
 # https://pypi.python.org/pypi?:action=show_md5&digest=b5a15b03bf402fe254636c015fcf04da
 md5 b5a15b03bf402fe254636c015fcf04da  Pillow-3.3.0.tar.gz
 md5 b5a15b03bf402fe254636c015fcf04da  Pillow-3.3.0.tar.gz
 # sha256 locally computed
 # sha256 locally computed
-sha256 031e7c9c885a4f343d1ad366c7fd2340449dc70318acb4a28d6411994f0accd1  Pillow-3.2.0.tar.gz
+sha256 031e7c9c885a4f343d1ad366c7fd2340449dc70318acb4a28d6411994f0accd1  Pillow-3.3.0.tar.gz

+ 11 - 2
package/python-pillow/python-pillow.mk

@@ -54,11 +54,20 @@ else
 PYTHON_PILLOW_BUILD_OPTS += --disable-zlib
 PYTHON_PILLOW_BUILD_OPTS += --disable-zlib
 endif
 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_BASE_ENV) $(PYTHON_PILLOW_ENV) \
 		$(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \
 		$(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \
 		$(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS)
 		$(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))
 $(eval $(python-package))