diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-08-15 20:31:50 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-08-15 20:31:50 +0200 |
| commit | fc97ab953e517b90e1eed4c5d752d9548d1ac22b (patch) | |
| tree | 7879b6b66dd13b01c15cb6804f4624fc2779c4f0 /scripts/lib/ptxd_make_world_install.sh | |
| parent | 04edb3a42f4312034c511747100396d472354fbe (diff) | |
| download | ptxdist-fc97ab953e517b90e1eed4c5d752d9548d1ac22b.tar.gz ptxdist-fc97ab953e517b90e1eed4c5d752d9548d1ac22b.tar.xz | |
ptxd_make_world_install: replace binconfig stuff before copying to sysroot
Some configure scripts may look for <pkg>-config in <sysroot>/usr/bin
This can happen when setting --<pkg>dir=<sysroot>/usr. So having
'@SYSROOT@' in <sysroot>/usr/bin/<pkg>-config is not good.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_install.sh')
| -rw-r--r-- | scripts/lib/ptxd_make_world_install.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/ptxd_make_world_install.sh b/scripts/lib/ptxd_make_world_install.sh index 7599ecd24..38e0716b3 100644 --- a/scripts/lib/ptxd_make_world_install.sh +++ b/scripts/lib/ptxd_make_world_install.sh @@ -153,8 +153,6 @@ ptxd_make_world_install_post() { sed -i -e "s:@SYSROOT@:${pkg_sysroot_dir}:g" && check_pipe_status && - cp -dprf -- "${pkg_pkg_dir}"/* "${pkg_sysroot_dir}" && - # fix *-config and copy into sysroot_cross for target packages local config && find "${pkg_pkg_dir}" ! -type d -name "${pkg_binconfig_glob}" | while read config; do @@ -162,6 +160,8 @@ ptxd_make_world_install_post() { if [ "${pkg_type}" = "target" ]; then cp -P -- "${config}" "${PTXDIST_SYSROOT_CROSS}/bin" || return fi - done + done && + + cp -dprf -- "${pkg_pkg_dir}"/* "${pkg_sysroot_dir}" } export -f ptxd_make_world_install_post |