From 49cf5815e305f90d00bf22a55a9cbfbad68e2750 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 16 Dec 2016 02:22:41 +0100 Subject: [PATCH] python: move includes after common package variables Move the python-host.mk and python-package.mk includes after the definition of common package variables. This is required to ensure that PKG_UNPACK is not set to to the dummy "true" command which happens if PKG_SOURCE is not yet set. Fixes the following error observed while attempting to build Python on a recent LEDE version: make[2]: Entering directory '.../lang/python' true [ ! -d ./src/ ] || cp -fpR ./src/* .../Python-2.7.12 Applying ./patches/001-enable-zlib.patch using plaintext: can't find file to patch at input line 14 Perhaps you used the wrong -p or --strip option? [...] Patch failed! Please fix ./patches/001-enable-zlib.patch! Makefile:242: recipe for target '.../Python-2.7.12/.prepared_...' failed Signed-off-by: Jo-Philipp Wich --- lang/python/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/python/Makefile b/lang/python/Makefile index 3eb4e9dad..4b677423c 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -10,12 +10,6 @@ include $(TOPDIR)/rules.mk # For PYTHON_VERSION include ./files/python-version.mk -# This file provides the necsessary host build variables -include ./files/python-host.mk - -# For PyPackage -include ./files/python-package.mk - PKG_NAME:=python PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) PKG_RELEASE:=2 @@ -27,6 +21,12 @@ PKG_MD5SUM:=57dffcee9cee8bb2ab5f82af1d8e9a69 PKG_LICENSE:=PSF PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE +# This file provides the necsessary host build variables +include ./files/python-host.mk + +# For PyPackage +include ./files/python-package.mk + PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1