From c4ac8a23f628450a3f627d69b9ff509b086d6eb3 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 13 Jun 2016 09:20:00 +0200 Subject: install_copy_toolchain: go back to old install handling Using just 'ptxd_install_file' does not install all symlinks and ptxd_install_shared does not handle errors correctly causes some symlinks to be installed again. Signed-off-by: Michael Olbrich --- scripts/install_copy_toolchain.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/scripts/install_copy_toolchain.sh b/scripts/install_copy_toolchain.sh index 2e2616e9b..150acc80f 100755 --- a/scripts/install_copy_toolchain.sh +++ b/scripts/install_copy_toolchain.sh @@ -171,6 +171,21 @@ ptxd_install_toolchain_lib() { perm="$(stat -c %a "${lib_path}")" echo "ptxd_install_file \"${lib_path}\" \"${prefix}/${lib}\" 0 0 \"${perm}\" \"${strip}\"" >> "${STATEDIR}/${packet}.cmds" + + # now create some links to that lib + # e.g. libstdc++.so.6 -> libstdc++.so.6.6.6 + + # the fullversion (6.6.6) + v_full="${lib#*.so.}" + # library name with major version (libstdc++.so.6) + lib_v_major="${lib%${v_full}}${v_full%%.*}" + + if test "${v_full}" != "${lib}" -a \ + "${lib_v_major}" != "${lib}"; then + echo "extra link - ${prefix}/${lib_v_major}" + + echo "ptxd_install_link \"${lib}\" \"${prefix}/${lib_v_major}\"" >> "${STATEDIR}/${packet}.cmds" + fi fi else echo "error: found ${lib_path}, but neither file nor link" 2>&1 -- cgit v1.2.3