diff options
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/host-python.make | 4 | ||||
| -rw-r--r-- | rules/host-python3.make | 4 | ||||
| -rw-r--r-- | rules/post/ptxd_make_world_common.make | 8 | ||||
| -rw-r--r-- | rules/pre/Rules.make | 3 | ||||
| -rw-r--r-- | rules/python3.make | 2 |
5 files changed, 19 insertions, 2 deletions
diff --git a/rules/host-python.make b/rules/host-python.make index fc89b90eb..1d678b22a 100644 --- a/rules/host-python.make +++ b/rules/host-python.make @@ -16,7 +16,9 @@ HOST_PACKAGES-$(PTXCONF_HOST_PYTHON) += host-python # # Paths and names # -HOST_PYTHON_DIR = $(HOST_BUILDDIR)/$(PYTHON) +HOST_PYTHON_DIR = $(HOST_BUILDDIR)/$(PYTHON) + +HOSTPYTHON = $(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON_MAJORMINOR) # ---------------------------------------------------------------------------- # Prepare diff --git a/rules/host-python3.make b/rules/host-python3.make index f00e956d4..a20a2613c 100644 --- a/rules/host-python3.make +++ b/rules/host-python3.make @@ -17,7 +17,9 @@ HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3) += host-python3 # # Paths and names # -HOST_PYTHON3_DIR = $(HOST_BUILDDIR)/$(PYTHON3) +HOST_PYTHON3_DIR = $(HOST_BUILDDIR)/$(PYTHON3) + +HOSTPYTHON3 = $(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON3_MAJORMINOR) # ---------------------------------------------------------------------------- # Prepare diff --git a/rules/post/ptxd_make_world_common.make b/rules/post/ptxd_make_world_common.make index ed2c840cc..68950645d 100644 --- a/rules/post/ptxd_make_world_common.make +++ b/rules/post/ptxd_make_world_common.make @@ -46,6 +46,14 @@ ptx/env = \ ptx_conf_opt_autoconf_cross="$(call ptx/escape,$(HOST_CROSS_AUTOCONF))" \ ptx_conf_opt_autoconf_cross_sysroot="$(call ptx/escape,$(HOST_CROSS_AUTOCONF_SYSROOT))"\ \ + ptx_python_target="$(call ptx/escape,$(CROSS_PYTHON))" \ + ptx_python3_target="$(call ptx/escape,$(CROSS_PYTHON3))" \ + ptx_install_opt_python_target="$(call ptx/escape,$(CROSS_PYTHON_INSTALL))"\ + \ + ptx_python_host="$(call ptx/escape,$(HOSTPYTHON))" \ + ptx_python3_host="$(call ptx/escape,$(HOSTPYTHON3))" \ + ptx_install_opt_python_host="$(call ptx/escape,$(HOST_PYTHON_INSTALL))" \ + \ ptx_ipkg_extra_args=$(PTXCONF_IMAGE_IPKG_EXTRA_ARGS) \ ptx_opkg_extra_args=$(PTXCONF_IMAGE_OPKG_EXTRA_ARGS) \ ptx_xpkg_type=$(PTXCONF_HOST_PACKAGE_MANAGEMENT) diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index 9e770d5f9..69dbb4289 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -254,6 +254,9 @@ CROSS_QMAKE_OPT := \ -recursive \ $(if $(filter 0,$(PTXDIST_VERBOSE)),CONFIG+=silent) +CROSS_PYTHON_INSTALL := install --prefix=/usr +HOST_PYTHON_INSTALL := install --prefix= + ifdef PTXCONF_GLOBAL_IPV6 GLOBAL_IPV6_OPTION := --enable-ipv6 else diff --git a/rules/python3.make b/rules/python3.make index df2837043..10eb9b47a 100644 --- a/rules/python3.make +++ b/rules/python3.make @@ -30,6 +30,8 @@ PYTHON3_URL := \ http://python.org/ftp/python/$(PYTHON3_VERSION)/$(PYTHON3).$(PYTHON3_SUFFIX) \ http://python.org/ftp/python/$(PYTHON3_MAJORMINOR)/$(PYTHON3).$(PYTHON3_SUFFIX) +CROSS_PYTHON3 := $(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR) + # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- |