Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

external-sourcery-toolchain: handle libdir/bin not existing

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
  • Loading branch information...
commit cb8785cf9d9907d4cadda158ec9832cd072f038e 1 parent 5712c63
Christopher Larson kergoth authored

Showing 1 changed file with 10 additions and 7 deletions. Show diff stats Hide diff stats

  1. +10 7 recipes/meta/external-sourcery-toolchain.bb
17 recipes/meta/external-sourcery-toolchain.bb
@@ -22,7 +22,7 @@ PROVIDES = "\
22 22 libgcc \
23 23 "
24 24 PV = "${CSL_VER_MAIN}"
25   -PR = "r10"
  25 +PR = "r11"
26 26
27 27 #SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/${CSL_TARGET_SYS}/arm-${PV}-${TARGET_PREFIX}i686-pc-linux-gnu.tar.bz2"
28 28
@@ -57,12 +57,15 @@ do_install() {
57 57 fi
58 58
59 59 ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', PN, '', 'rm -rf ${D}${includedir}/linux ${D}${includedir}/asm*', d)}
60   - rm ${D}${sysconfdir}/rpc
61   - rm -r ${D}${datadir}/zoneinfo
62   -
63   - cp -a ${D}${libdir}/bin/. ${D}${bindir}/
64   - rm ${D}${libdir}/bin/*
65   - ln -s ../../bin/gdbserver ${D}${libdir}/bin/sysroot-gdbserver
  60 + rm -f ${D}${sysconfdir}/rpc
  61 + rm -rf ${D}${datadir}/zoneinfo
  62 +
  63 + if [ -e ${D}${libdir}/bin ]; then
  64 + cp -a ${D}${libdir}/bin/. ${D}${bindir}/
  65 + rm -r ${D}${libdir}/bin
  66 + install -d ${D}${libdir}/bin
  67 + ln -s ../../bin/gdbserver ${D}${libdir}/bin/sysroot-gdbserver
  68 + fi
66 69
67 70 sed -i -e "s# ${base_libdir}# ../..${base_libdir}#g" -e "s# ${libdir}# .#g" ${D}${libdir}/libc.so
68 71 sed -i -e "s# ${base_libdir}# ../..${base_libdir}#g" -e "s# ${libdir}# .#g" ${D}${libdir}/libpthread.so

0 comments on commit cb8785c

Please sign in to comment.
Something went wrong with that request. Please try again.