diff options
Diffstat (limited to 'package/python/python.mk')
-rw-r--r-- | package/python/python.mk | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/package/python/python.mk b/package/python/python.mk index 6a6aaaccba..bc42e8f14f 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -51,6 +51,12 @@ PYTHON_DEPENDENCIES = host-python libffi HOST_PYTHON_DEPENDENCIES = host-expat host-zlib +define HOST_PYTHON_INSTALL_PGEN + $(INSTALL) -m0755 -D $(@D)/Parser/pgen $(HOST_DIR)/usr/bin/python-pgen +endef + +HOST_PYTHON_POST_INSTALL_HOOKS += HOST_PYTHON_INSTALL_PGEN + PYTHON_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y) @@ -113,10 +119,15 @@ PYTHON_DEPENDENCIES += openssl endif PYTHON_CONF_ENV += \ - PYTHON_FOR_BUILD=$(HOST_PYTHON_DIR)/python \ - PGEN_FOR_BUILD=$(HOST_PYTHON_DIR)/Parser/pgen \ + PYTHON_FOR_BUILD=$(HOST_DIR)/usr/bin/python \ + PGEN_FOR_BUILD=$(HOST_DIR)/usr/bin/python-pgen \ ac_cv_have_long_long_format=yes +PYTHON_MAKE_ENV += \ + _python_sysroot=$(STAGING_DIR) \ + PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/usr/include \ + PYTHON_MODULES_LIB="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" + PYTHON_CONF_OPT += \ --without-cxx-main \ --without-doc-strings \ @@ -129,19 +140,6 @@ PYTHON_CONF_OPT += \ --disable-nis \ --disable-dbm -PYTHON_MAKE_ENV = \ - PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/usr/include \ - PYTHON_MODULES_LIB="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" - -# python distutils adds -L$LIBDIR when linking binary extensions, causing -# trouble for cross compilation -define PYTHON_FIXUP_LIBDIR - $(SED) 's|^LIBDIR=.*|LIBDIR= $(STAGING_DIR)/usr/lib|' \ - $(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config/Makefile -endef - -PYTHON_POST_INSTALL_STAGING_HOOKS += PYTHON_FIXUP_LIBDIR - # # Remove useless files. In the config/ directory, only the Makefile # and the pyconfig.h files are needed at runtime. |