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 /scripts/lib/ptxd_make_world_common.sh | |
| 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 'scripts/lib/ptxd_make_world_common.sh')
| -rw-r--r-- | scripts/lib/ptxd_make_world_common.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index 8e7bbdaa5..12f8ba6c2 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -199,13 +199,6 @@ ptxd_make_world_init() { ptxd_make_world_init_sanity_check || return # - # sanitize pkg_pkg_dir - # - if [ "${pkg_pkg_dir}" = "${ptx_pkg_dir}/" ]; then - pkg_pkg_dir="" - fi - - # # type # case "${pkg_stamp}" in @@ -214,6 +207,15 @@ ptxd_make_world_init() { esac # + # sanitize pkg_pkg_dir + # + if [ "${pkg_pkg_dir}" = "${ptx_pkg_dir}/" -o \ + "${pkg_pkg_dev}" = "NO" -a "${pkg_type}" != "target" ]; then + pkg_pkg_dir="" + local conf_opt_ext="_sysroot" + fi + + # # label + stage # pkg_label="${pkg_stamp%%.*}" @@ -259,7 +261,7 @@ ptxd_make_world_init() { case "${pkg_conf_tool}" in autoconf|cmake|qmake) - local conf_opt_ptr="ptx_conf_opt_${pkg_conf_tool}_${pkg_type}" + local conf_opt_ptr="ptx_conf_opt_${pkg_conf_tool}_${pkg_type}${conf_opt_ext}" local conf_env_ptr="ptx_conf_env_${pkg_type}" pkg_conf_opt="${pkg_conf_opt:-${!conf_opt_ptr}}" |