diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-05-22 13:55:20 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-05-26 07:21:41 +0200 |
| commit | b6f9a55b3ddc526a136b9616a244db6f050e9a41 (patch) | |
| tree | 56a2ce58ea71cd53d54e0efc448da5ee28223b17 /scripts/lib/ptxd_make_world_patchin.sh | |
| parent | d92fba8770041e770a317eed7b029a46f2fefe99 (diff) | |
| download | ptxdist-b6f9a55b3ddc526a136b9616a244db6f050e9a41.tar.gz ptxdist-b6f9a55b3ddc526a136b9616a244db6f050e9a41.tar.xz | |
ptxd_make_world_patchin: run use pkg_dir for patchin_fixup
This way, it is also called when the tarball is replaced with a symlink in
local_src/. Also allow symlinks for ltmain.sh and config.sub. They will be
replaced with modified copies of the original link target.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_patchin.sh')
| -rw-r--r-- | scripts/lib/ptxd_make_world_patchin.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh index 60abd1e42..1cdd96c88 100644 --- a/scripts/lib/ptxd_make_world_patchin.sh +++ b/scripts/lib/ptxd_make_world_patchin.sh @@ -345,7 +345,7 @@ ptxd_make_world_patchin_fixup() local file echo "patchin: fixup:" - find "${pkg_patchin_dir}/" -name "configure" -a -type f -a \! -path "*/.pc/*" | while read file; do + find "${pkg_dir}/" -name "configure" -a -type f -a \! -path "*/.pc/*" | while read file; do ptxd_print_path "${file}" # # the first fixes a problem with libtool on blackfin: @@ -363,7 +363,7 @@ ptxd_make_world_patchin_fixup() "${file}" || return done && - find "${pkg_patchin_dir}/" -name "ltmain.sh" -a -type f -a \! -path "*/.pc/*" | while read file; do + find "${pkg_dir}/" -name "ltmain.sh" -a \( -type f -o -type l \) -a \! -path "*/.pc/*" | while read file; do ptxd_print_path "${file}" # # this sed turns of the relinking during "make install" (it @@ -377,7 +377,7 @@ ptxd_make_world_patchin_fixup() ptxd_get_alternative scripts/autoconf config.sub local config_sub="${ptxd_reply}" - find "${pkg_patchin_dir}/" -type f -name "config.sub" ! -path "*/.pc/*" | while read file; do + find "${pkg_dir}/" \( -type f -o -type l \) -name "config.sub" ! -path "*/.pc/*" | while read file; do ptxd_print_path "${file}" cp -f "${config_sub}" "${file}" || return done && @@ -478,8 +478,10 @@ ptxd_make_world_patchin_post() { cd "${pkg_patchin_dir}" && if [ -n "${pkg_patch_dir}" ]; then ptxd_make_world_autogen - fi && - + fi + ) fi && + if [ -n "${pkg_dir}" ]; then ( + cd "${pkg_dir}" && if [ "${pkg_type}" = "target" ]; then ptxd_make_world_patchin_fixup fi |