diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-09 06:24:38 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-09 08:47:13 +0200 |
| commit | 6f4d325df5519daf8c16f3a17c72fcc633c61290 (patch) | |
| tree | b9c5ab9bb70fa275383a4b45f3332d00156fc06a | |
| parent | f1e39da158b350d770a3691de4df72346d6a8098 (diff) | |
| download | ptxdist-6f4d325df5519daf8c16f3a17c72fcc633c61290.tar.gz ptxdist-6f4d325df5519daf8c16f3a17c72fcc633c61290.tar.xz | |
ptxd_make_world_install_post: improve pkg-config whitelist handling
For host and cross packages that install directly into sysroot,
<PKG>_PKGDIR is not used, so the pkg-config whitelist will be empty.
Find the .pc files in the build tree instead as a workaround.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_make_world_install.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/lib/ptxd_make_world_install.sh b/scripts/lib/ptxd_make_world_install.sh index 26a5ec160..19b301fe3 100644 --- a/scripts/lib/ptxd_make_world_install.sh +++ b/scripts/lib/ptxd_make_world_install.sh @@ -223,6 +223,10 @@ ptxd_make_world_install_post() { if [ -n "${pkg_pkg_dir}" -a -d "${pkg_pkg_dir}" ]; then find "${pkg_pkg_dir}"{,/usr}/{lib,share}/pkgconfig -name *.pc \ -printf "%f\n" 2>/dev/null | sed 's/\.pc$//' + elif [ "${pkg_type}" != "target" -a -n "${pkg_build_dir}" -a -d "${pkg_build_dir}" ]; then + # workaround for packages that install directly to sysroot + find "${pkg_build_dir}" -name *.pc \ + -printf "%f\n" 2>/dev/null | sed 's/\.pc$//' fi for dep in ${pkg_build_deps}; do case "${dep}" in |