diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-10-27 10:47:16 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-10-27 18:23:02 +0200 |
| commit | 771cef2579a0badf8a6a075e06aa8c6a12a7955b (patch) | |
| tree | 994e4e828be4f41bba31e434f043a83e043b35ab | |
| parent | 5dc334866f42665cb7dcf8d51fd90fc3554d15d4 (diff) | |
| download | ptxdist-771cef2579a0badf8a6a075e06aa8c6a12a7955b.tar.gz ptxdist-771cef2579a0badf8a6a075e06aa8c6a12a7955b.tar.xz | |
[ptxdist] stricter search algorithm for install_lib
Until now the $(install_lib) mechanism is searching for lib<bla>.so*
anywhere in /lib,/usr/lib. In libpv we have a libpv.so*, but also a
python module deeper in the tree that is also named libpv.so, so the
find triggers twice and the check for a file fails.
On the other hand in mysql the libs are in a subdirectory. To make
both work we now match the whole path to {/lib,/usr/lib}/${libname}.so*
and add the subdirectories to libname.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_pkg.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh index c12dc5973..ba4bd01d7 100644 --- a/scripts/lib/ptxd_make_xpkg_pkg.sh +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh @@ -543,7 +543,7 @@ ptxd_install_lib() { shift local file="$(for dir in "${pkg_pkg_dir}/"{,usr/}lib; do - find "${dir}" -type f -name "${lib}.so*"; done 2>/dev/null)" + find "${dir}" -type f -path "${dir}/${lib}.so*"; done 2>/dev/null)" if [ ! -f "${file}" ]; then ptxd_install_error "ptxd_lib_install: cannot find library '${lib}'!" |