From 06fbe038ab7b2da7fc0ddabdc045c1ca43de1ed4 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Fri, 15 Apr 2016 10:57:58 +0300 Subject: [PATCH] python3: revert $(STAGING_DIR)/host to $(STAGING_DIR_HOST) change Also, override all prefix args in the HOST_CONFIGURE_ARGS so that this works fine on CC/15.05. There are some changes in core regarding package builds that require this. Signed-off-by: Alexandru Ardelean --- lang/python3/Makefile | 19 ++++++++++++------- lang/python3/files/python3-package.mk | 4 ++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lang/python3/Makefile b/lang/python3/Makefile index 514d13781a..ae91f2fbb7 100644 --- a/lang/python3/Makefile +++ b/lang/python3/Makefile @@ -14,7 +14,7 @@ PYTHON_VERSION:=$(PYTHON3_VERSION) PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO) PKG_NAME:=python3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz @@ -147,7 +147,7 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(1)/usr/include/ $(CP) \ - $(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) \ + $(STAGING_DIR)/host/lib/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \ $(1)/usr/lib/ $(CP) \ @@ -217,8 +217,13 @@ HOST_CONFIGURE_ARGS+= \ --without-cxx-main \ --without-pymalloc \ --with-threads \ - --prefix=$(STAGING_DIR_HOST) \ - --with-system-expat=$(STAGING_DIR_HOST) \ + --prefix=$(STAGING_DIR)/host \ + --exec-prefix=$(STAGING_DIR)/host \ + --sysconfdir=$(STAGING_DIR_HOST)/host/etc \ + --localstatedir=$(STAGING_DIR)/host/var \ + --sbindir=$(STAGING_DIR)/host/bin \ + --with-system-expat=$(STAGING_DIR)/host \ + --with-system-ffi=$(STAGING_DIR)/host \ --with-ensurepip=upgrade \ CONFIG_SITE= \ CFLAGS="$(HOST_CFLAGS)" @@ -229,10 +234,10 @@ define Host/Compile endef define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ + $(INSTALL_DIR) $(STAGING_DIR)/host/bin/ $(MAKE) -C $(HOST_BUILD_DIR) install - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen3 - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(STAGING_DIR_HOST)/bin/_freeze_importlib + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR)/host/bin/pgen3 + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(STAGING_DIR)/host/bin/_freeze_importlib endef $(eval $(call HostBuild)) diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk index d1fbd038f5..72c499502c 100644 --- a/lang/python3/files/python3-package.mk +++ b/lang/python3/files/python3-package.mk @@ -20,8 +20,8 @@ PYTHON3_PKG_DIR:=/usr/lib/python$(PYTHON3_VERSION)/site-packages PYTHON3:=python$(PYTHON3_VERSION) -HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON3_VERSION) -HOST_PYTHON3_BIN:=$(STAGING_DIR_HOST)/bin/python3 +HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR)/host/lib/python$(PYTHON3_VERSION) +HOST_PYTHON3_BIN:=$(STAGING_DIR)/host/bin/python3 PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR) define HostPython3 -- 2.30.2