Revert "python: don't use libressl for host build"

[feed/packages.git] / lang / python / Makefile

diff --git a/lang/python/Makefile b/lang/python/Makefile
index c333f8e0855f3760504f6d80e9b1d1c2ca681f5d..ae9a2146ebe5e312ea71f10db43d0315d2bcbdcd 100644 (file)
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -7,20 +7,27 @@
 
 include $(TOPDIR)/rules.mk
 
-# The file included below defines PYTHON_VERSION
-include ./files/python-package.mk
+# For PYTHON_VERSION
+include ./files/python-version.mk
 
 PKG_NAME:=python
 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
-PKG_MD5SUM:=57dffcee9cee8bb2ab5f82af1d8e9a69
+PKG_MD5SUM:=53b43534153bb2a0363f08bae8b9d990
+PKG_HASH:=35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731
 
 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
@@ -116,13 +123,21 @@ ifeq ($(CONFIG_IPV6),y)
        ENABLE_IPV6 += --enable-ipv6
 endif
 
+PYTHON_FOR_BUILD:= \
+       _PYTHON_PROJECT_BASE=$(PKG_BUILD_DIR) \
+       _PYTHON_HOST_PLATFORM=linux2 \
+       PYTHONPATH="$(PKG_BUILD_DIR)/Lib:$(PKG_BUILD_DIR)/build/lib.linux2-$(PYTHON_VERSION)" \
+       _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata \
+       $(HOST_PYTHON_BIN)
+
 CONFIGURE_ARGS+= \
        --sysconfdir=/etc \
        --enable-shared \
        --without-cxx-main \
        --with-threads \
-       --with-system-ffi="$(STAGING_DIR)/usr" \
+       --with-system-ffi \
        --without-pymalloc \
+       PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)" \
        $(ENABLE_IPV6) \
        CONFIG_SITE="$(PKG_BUILD_DIR)/config.site" \
        OPT="$(TARGET_CFLAGS)"
@@ -139,18 +154,19 @@ define Build/InstallDev
        $(INSTALL_DATA) \
                ./files/python-package.mk \
                ./files/python-host.mk \
+               ./files/python-version.mk \
                $(STAGING_DIR)/mk/
        $(CP) \
                $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
                $(1)/usr/include/
        $(CP) \
-               $(HOST_BUILD_PREFIX)/lib/python$(PYTHON_VERSION) \
+               $(HOST_PYTHON_LIB_DIR) \
                $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \
                $(1)/usr/lib/
        $(CP) \
-               $(HOST_BUILD_PREFIX)/lib/pkgconfig/python.pc \
-               $(HOST_BUILD_PREFIX)/lib/pkgconfig/python2.pc \
-               $(HOST_BUILD_PREFIX)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \
+               $(HOST_PYTHON_DIR)/lib/pkgconfig/python.pc \
+               $(HOST_PYTHON_DIR)/lib/pkgconfig/python2.pc \
+               $(HOST_PYTHON_DIR)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \
                $(1)/usr/lib/pkgconfig
        $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \
@@ -213,28 +229,20 @@ define PyPackage/python/filespec
 -|$(PYTHON_PKG_DIR)
 endef
 
-HOST_CFLAGS+= \
-       -I/usr/include/ncursesw \
-       -I/usr/include/ncurses
-
 HOST_CONFIGURE_ARGS+= \
        --without-cxx-main \
        --without-pymalloc \
        --with-threads \
-       --prefix=$(HOST_BUILD_PREFIX) \
-       --exec-prefix=$(HOST_BUILD_PREFIX) \
-       --sysconfdir=$(HOST_BUILD_PREFIX)/etc \
-       --localstatedir=$(HOST_BUILD_PREFIX)/var \
-       --sbindir=$(HOST_BUILD_PREFIX)/bin \
-       --with-system-expat=$(HOST_BUILD_PREFIX) \
-       --with-system-ffi=$(HOST_BUILD_PREFIX) \
-       CONFIG_SITE= \
-       CFLAGS="$(HOST_CFLAGS)"
+       --prefix=$(HOST_PYTHON_DIR) \
+       --exec-prefix=$(HOST_PYTHON_DIR) \
+       --with-system-expat=$(STAGING_DIR_HOSTPKG) \
+       --with-system-ffi \
+       CONFIG_SITE=
 
 define Host/Install
        $(MAKE) -C $(HOST_BUILD_DIR) install
-       $(INSTALL_DIR) $(HOST_BUILD_PREFIX)/bin/
-       $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_BUILD_PREFIX)/bin/pgen2
+       $(INSTALL_DIR) $(HOST_PYTHON_DIR)/bin/
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON_DIR)/bin/pgen2
 endef
 
 $(eval $(call HostBuild))