diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-20 11:47:44 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-23 13:52:30 +0200 |
| commit | 25c4841321880dad495baf8376a61463d087db4c (patch) | |
| tree | a75fd250d32b4546a91a4bea9305426593653e3f /rules | |
| parent | 8c2eeee753597e919dffc5254dad54e9ec6f8947 (diff) | |
| download | ptxdist-25c4841321880dad495baf8376a61463d087db4c.tar.gz ptxdist-25c4841321880dad495baf8376a61463d087db4c.tar.xz | |
[install] install host/cross packages to pkgdir by default
define *_SYSROOT for use by others
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/post/ptxd_make_world_common.make | 3 | ||||
| -rw-r--r-- | rules/pre/Rules.make | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/rules/post/ptxd_make_world_common.make b/rules/post/ptxd_make_world_common.make index ea9ea2932..8824d9197 100644 --- a/rules/post/ptxd_make_world_common.make +++ b/rules/post/ptxd_make_world_common.make @@ -29,10 +29,13 @@ world/env/impl = \ ptx_conf_env_host="$(call ptx/escape,$(HOST_ENV))" \ ptx_conf_opt_autoconf_host="$(call ptx/escape,$(HOST_AUTOCONF))" \ ptx_conf_opt_cmake_host="$(call ptx/escape,$(HOST_CMAKE_OPT))" \ + ptx_conf_opt_autoconf_host_sysroot="$(call ptx/escape,$(HOST_AUTOCONF_SYSROOT))"\ + ptx_conf_opt_cmake_host_sysroot="$(call ptx/escape,$(HOST_CMAKE_OPT_SYSROOT))"\ \ ptx_path_cross="${call ptx/escape,$(HOST_CROSS_PATH)}" \ ptx_conf_env_cross="$(call ptx/escape,$(HOST_CROSS_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))" \ \ pkg_stamp="$(notdir $(@))" \ pkg_pkg_dir="$(call ptx/escape,$($(1)_PKGDIR))" \ diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index a8c79db8f..f73b04b51 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -315,9 +315,11 @@ HOST_ENV := \ $(HOST_ENV_PYTHONPATH) -HOST_AUTOCONF := --prefix=$(PTXDIST_SYSROOT_HOST) +HOST_AUTOCONF := --prefix= +HOST_AUTOCONF_SYSROOT := --prefix=$(PTXDIST_SYSROOT_HOST) -HOST_CMAKE_OPT := -DCMAKE_INSTALL_PREFIX=$(PTXDIST_SYSROOT_HOST) -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo +HOST_CMAKE_OPT := -DCMAKE_INSTALL_PREFIX= -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo +HOST_CMAKE_OPT_SYSROOT := -DCMAKE_INSTALL_PREFIX=$(PTXDIST_SYSROOT_HOST) -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo # ---------------------------------------------------------------------------- # HOST_CROSS stuff @@ -327,7 +329,8 @@ HOST_CROSS_PATH := $(CROSS_PATH) HOST_CROSS_ENV := $(HOST_ENV) -HOST_CROSS_AUTOCONF := --prefix=$(PTXDIST_SYSROOT_CROSS) +HOST_CROSS_AUTOCONF := --prefix= +HOST_CROSS_AUTOCONF_SYSROOT := --prefix=$(PTXDIST_SYSROOT_CROSS) # ---------------------------------------------------------------------------- # Convenience macros |