Split python into a host and target build. Also add a HostPython macro to conveniently and safely invoke host python binary.

git-svn-id: svn://svn.openwrt.org/openwrt/packages@23666 3c298f89-4303-0410-b956-a3cf2f4a3e73

lang/distribute/Makefile

@@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 $(call include_mk, python-package.mk)
 
-PYTHON:=$(STAGING_DIR)/usr/bin/hostpython
+PYTHON:=$(HOST_PYTHON_BIN)
 
 define Package/distribute
   SUBMENU:=Python

lang/python/Makefile

@@ -14,10 +14,17 @@ PKG_RELEASE:=3
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)/
 PKG_MD5SUM:=fee5408634a54e721a93531aba37f8c1
+
+PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
+HOST_BUILD_PARALLEL:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION)
 
+PKG_BUILD_DEPENDS:=python/host
+
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,./files/python-package.mk)
 
@@ -107,43 +114,26 @@ endef
 PY_DISABLED_MODULES:= \
 	readline _curses _curses_panel _tkinter nis
 
-MAKE_OPTS:=\
+MAKE_FLAGS:=\
 	$(TARGET_CONFIGURE_OPTS) \
 	PYTHON_DISABLE_MODULES="$(PY_DISABLED_MODULES)" \
 	PYTHON_MODULES_INCLUDE="$(STAGING_DIR)/usr/include" \
 	PYTHON_MODULES_LIB="$(STAGING_DIR)/usr/lib" \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
 	CROSS_COMPILE=yes \
 	CFLAGS="$(TARGET_CFLAGS) -fno-inline" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	LD="$(TARGET_CC)" \
 	HOSTPYTHON=./hostpython \
-	HOSTPGEN=./hostpgen \
+	HOSTPGEN=./hostpgen
 
 define Build/Configure
-endef
-
-define Build/Compile
 	-$(MAKE) -C $(PKG_BUILD_DIR) distclean
-	(cd $(PKG_BUILD_DIR); autoreconf --force --install || exit 0);
+	(cd $(PKG_BUILD_DIR); autoreconf --force --install || exit 0)
-	(cd $(PKG_BUILD_DIR); \
-		rm -rf config.cache; \
-		CONFIG_SITE= \
-		OPT="$(HOST_CFLAGS)" \
-		./configure --without-cxx-main --without-threads --prefix=$(PKG_INSTALL_DIR)/host; \
-	);
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		python Parser/pgen
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		HOSTPYTHON=$(PKG_BUILD_DIR)/python \
-		sharedmods
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		HOSTPYTHON=$(PKG_BUILD_DIR)/python \
-		install
-	(cd $(PKG_BUILD_DIR);mv Parser/pgen hostpgen)
 	# The python executable needs to stay in the rootdir since its location will
 	# be used to compute the path of the config files.
-	$(CP) $(PKG_BUILD_DIR)/python $(PKG_BUILD_DIR)/hostpython
+	$(CP) $(STAGING_DIR_HOST)/bin/pgen $(PKG_BUILD_DIR)/hostpgen
-	$(MAKE) -C $(PKG_BUILD_DIR) distclean
+	$(CP) $(STAGING_DIR_HOST)/bin/python $(PKG_BUILD_DIR)/hostpython
 	$(call Build/Configure/Default, \
 		--sysconfdir=/etc \
 		--disable-shared \
@@ -156,40 +146,30 @@ define Build/Compile
 		ac_cv_py_format_size_t=no \
 		OPT="$(TARGET_CFLAGS)" \
 	)
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		$(MAKE_OPTS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(MAKE_OPTS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/mk $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
+	$(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
-	$(INSTALL_DATA) ./files/python-package.mk $(1)/mk/
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
 		$(1)/usr/include/
 	$(CP) \
-		$(PKG_INSTALL_DIR)/host/lib/python$(PYTHON_VERSION) \
+		$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) \
 		$(PKG_BUILD_DIR)/libpython$(PYTHON_VERSION).a \
 		$(1)/usr/lib/
-
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \
 		$(1)/usr/lib/python$(PYTHON_VERSION)/
 
 	$(CP) \
-		$(PKG_INSTALL_DIR)/host/bin/python \
+		$(STAGING_DIR_HOST)/bin/python \
 		$(1)/usr/bin/hostpython
 	(cd $(2)/bin; \
 	ln -sf ../../usr/bin/hostpython python$(PYTHON_VERSION); \
 	ln -sf python$(PYTHON_VERSION) python)
 
 	$(CP) \
-		$(PKG_INSTALL_DIR)/host/bin/python$(PYTHON_VERSION)-config \
+		$(STAGING_DIR_HOST)/bin/python$(PYTHON_VERSION)-config \
 		$(2)/bin/
 	$(SED) 's,^#!.*,#!/usr/bin/env python$(PYTHON_VERSION),g' $(2)/bin/python$(PYTHON_VERSION)-config
 
@@ -412,6 +392,38 @@ define PyPackage/python-gdbm/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/gdbm.so
 endef
 
+define Host/Configure
+	-$(MAKE) -C $(HOST_BUILD_DIR) distclean
+	(cd $(HOST_BUILD_DIR); autoreconf --force --install || exit 0)
+	(cd $(HOST_BUILD_DIR); \
+		rm -rf config.cache; \
+		CONFIG_SITE= \
+		OPT="$(HOST_CFLAGS)" \
+		./configure --without-cxx-main --without-threads --prefix=$(STAGING_DIR_HOST); \
+	)
+endef
+
+define Host/Compile
+	$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
+		python Parser/pgen
+	$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
+		HOSTPYTHON=$(HOST_BUILD_DIR)/python \
+		sharedmods
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR)/mk/
+	$(INSTALL_DATA) ./files/python-package.mk $(STAGING_DIR)/mk/
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		HOSTPYTHON=$(HOST_BUILD_DIR)/python \
+		install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/
+endef
+
+
+$(eval $(call HostBuild))
+
 $(eval $(call PyPackage,python))
 $(eval $(call PyPackage,python-mini))
 $(eval $(call PyPackage,python-doc))

lang/python/files/python-package.mk

@@ -12,9 +12,20 @@ PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin
 PYTHON_INC_DIR:=$(PYTHON_DIR)/include/python$(PYTHON_VERSION)
 PYTHON_LIB_DIR:=$(PYTHON_DIR)/lib/python$(PYTHON_VERSION)
 
+PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
+
 PYTHON:=python$(PYTHON_VERSION)
 
-PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
+HOST_PYTHON_BIN:=$(STAGING_DIR)/usr/bin/hostpython
+
+define HostPython
+	(	export PYTHONPATH="$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR)"; \
+		export PYTHONOPTIMIZE=""; \
+		export PYTHONDONTWRITEBYTECODE=1; \
+		$(1) \
+		$(HOST_PYTHON_BIN) $(2); \
+	)
+endef
 
 define PyPackage
   $(call shexport,PyPackage/$(1)/filespec)
@@ -49,13 +60,18 @@ define PyPackage
   endef
 endef
 
+# $(1) => build subdir
+# $(2) => additional arguments to setup.py
+# $(3) => additional variables
 define Build/Compile/PyMod
-	( cd $(PKG_BUILD_DIR)/$(1); \
+	$(call HostPython, \
+		cd $(PKG_BUILD_DIR)/$(strip $(1)); \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="$(TARGET_CPPFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
 		$(3) \
-		$(PYTHON) ./setup.py $(2) && \
+		, \
-		find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f \
+		./setup.py $(2) \
-	);
+	)
+	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
 endef

libs/libdnet/Makefile

@@ -18,7 +18,14 @@ PKG_MD5SUM:=04c394ed8e1e7fc455456e79e908916d
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
+PKG_CONFIG_DEPENDS:=\
+	CONFIG_PACKAGE_libdnet \
+	CONFIG_PACKAGE_pydnet
+
+PKG_BUILD_DEPENDS:=PACKAGE_pydnet:python
+
 include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
 
 define Package/libdnet/Default
   SECTION:=libs
@@ -61,6 +68,26 @@ CONFIGURE_ARGS += \
 CONFIGURE_VARS += \
 	ac_cv_dnet_bsd_bpf=no
 
+define Build/Compile
+	$(call Build/Compile/Default)
+	$(if $(CONFIG_PACKAGE_pydnet), \
+		$(call Build/Compile/PyMod, \
+			python/, \
+			build \
+		) \
+	)
+endef
+
+define Build/Install
+	$(call Build/Install/Default)
+	$(if $(CONFIG_PACKAGE_pydnet), \
+		$(call Build/Compile/PyMod, \
+			python/, \
+			install --no-compile --prefix $(PKG_INSTALL_DIR)/usr \
+		) \
+	)
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(2)/bin
 	$(INSTALL_BIN) \
@@ -98,11 +125,7 @@ endef
 
 define Package/pydnet/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	cd $(PKG_BUILD_DIR)/python; \
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python* $(1)/usr/lib/
-	CFLAGS="$(TARGET_CFLAGS)" \
-	$(STAGING_DIR)/usr/bin/hostpython ./setup.py install \
-		--no-compile --prefix $(PKG_INSTALL_DIR)/usr
-	cp -a $(PKG_INSTALL_DIR)/usr/lib/python* $(1)/usr/lib/
 endef