From 205ee41506306811e7ea33e46a75861e3cf55551 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 3 Oct 2016 18:57:39 +0200
Subject: [PATCH] python, python-*: use default prefix for host install

Also fixes a few incorrect "$(STAGING_DIR_HOST)/host" paths.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 lang/python-cffi/Makefile        |  2 +-
 lang/python-ply/Makefile         |  2 +-
 lang/python-pycparser/Makefile   |  2 +-
 lang/python-setuptools/Makefile  |  2 +-
 lang/python/Makefile             | 26 +++++++++++++-------------
 lang/python/files/python-host.mk |  6 +++---
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lang/python-cffi/Makefile b/lang/python-cffi/Makefile
index 8fd86939a..b8a50009d 100644
--- a/lang/python-cffi/Makefile
+++ b/lang/python-cffi/Makefile
@@ -45,7 +45,7 @@ define Build/Compile
 endef
 
 define Host/Compile
-	$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR)/host")
+	$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)")
 endef
 
 define Host/Install
diff --git a/lang/python-ply/Makefile b/lang/python-ply/Makefile
index fe1306095..ba90ecb30 100644
--- a/lang/python-ply/Makefile
+++ b/lang/python-ply/Makefile
@@ -46,7 +46,7 @@ define Build/Compile
 endef
 
 define Host/Compile
-	$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR)/host")
+	$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)")
 endef
 
 define Host/Install
diff --git a/lang/python-pycparser/Makefile b/lang/python-pycparser/Makefile
index 8acab48f0..ff17417e7 100644
--- a/lang/python-pycparser/Makefile
+++ b/lang/python-pycparser/Makefile
@@ -47,7 +47,7 @@ define Build/Compile
 endef
 
 define Host/Compile
-	$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR)/host")
+	$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)")
 endef
 
 define Host/Install
diff --git a/lang/python-setuptools/Makefile b/lang/python-setuptools/Makefile
index 61b094f12..6efc433a4 100644
--- a/lang/python-setuptools/Makefile
+++ b/lang/python-setuptools/Makefile
@@ -63,7 +63,7 @@ endef
 
 define Host/Compile
 	$(call Build/Compile/HostPyMod,,\
-		install --root="$(STAGING_DIR)/host" --prefix="" \
+		install --root="$(HOST_BUILD_PREFIX)" --prefix="" \
 		--single-version-externally-managed \
 	)
 endef
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 02c473769..c333f8e08 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -144,13 +144,13 @@ define Build/InstallDev
 		$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
 		$(1)/usr/include/
 	$(CP) \
-		$(STAGING_DIR)/host/lib/python$(PYTHON_VERSION) \
+		$(HOST_BUILD_PREFIX)/lib/python$(PYTHON_VERSION) \
 		$(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \
 		$(1)/usr/lib/
 	$(CP) \
-		$(STAGING_DIR)/host/lib/pkgconfig/python.pc \
-		$(STAGING_DIR)/host/lib/pkgconfig/python2.pc \
-		$(STAGING_DIR)/host/lib/pkgconfig/python-$(PYTHON_VERSION).pc \
+		$(HOST_BUILD_PREFIX)/lib/pkgconfig/python.pc \
+		$(HOST_BUILD_PREFIX)/lib/pkgconfig/python2.pc \
+		$(HOST_BUILD_PREFIX)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \
 		$(1)/usr/lib/pkgconfig
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \
@@ -221,20 +221,20 @@ HOST_CONFIGURE_ARGS+= \
 	--without-cxx-main \
 	--without-pymalloc \
 	--with-threads \
-	--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 \
+	--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)"
 
 define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR)/host/bin/
 	$(MAKE) -C $(HOST_BUILD_DIR) install
-	$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR)/host/bin/pgen2
+	$(INSTALL_DIR) $(HOST_BUILD_PREFIX)/bin/
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_BUILD_PREFIX)/bin/pgen2
 endef
 
 $(eval $(call HostBuild))
diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk
index 8736d29ad..f6ea2171a 100644
--- a/lang/python/files/python-host.mk
+++ b/lang/python/files/python-host.mk
@@ -5,7 +5,7 @@
 # See /LICENSE for more information.
 #
 
-HOST_PYTHON_DIR:=$(STAGING_DIR)/host
+HOST_PYTHON_DIR:=$(HOST_BUILD_PREFIX)
 HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION)
 HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION)
 
@@ -13,7 +13,7 @@ HOST_PYTHON_PKG_DIR:=/lib/python$(PYTHON_VERSION)/site-packages
 
 HOST_PYTHON_BIN:=$(HOST_PYTHON_DIR)/bin/python$(PYTHON_VERSION)
 
-HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR)/host/$(HOST_PYTHON_PKG_DIR)
+HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(HOST_BUILD_PREFIX)/$(HOST_PYTHON_PKG_DIR)
 
 define HostPython
 	if [ "$(strip $(3))" == "HOST" ]; then \
@@ -44,7 +44,7 @@ define Build/Compile/HostPyMod
 		LDSHARED="$(HOSTCC) -shared" \
 		CFLAGS="$(HOST_CFLAGS)" \
 		CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON_INC_DIR)" \
-		LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR)/host/lib" \
+		LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(HOST_BUILD_PREFIX)/lib" \
 		_PYTHON_HOST_PLATFORM=linux2 \
 		$(3) \
 		, \