diff options
| author |   Koen Kooi <koen@openembedded.org> | 2007-10-18 12:12:05 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-18 12:12:05 +0000 |
| commit | b5bfd7f1fd6bd34ef51701e918b40f724cb46258 (patch) | |
| tree | 005a7d449e934743db904d5c09d8c4981e2971b5 /packages/meta/meta-toolchain.bb | |
| parent | 1c5df3f485ba9992931e06d07f28c57a29d89e5e (diff) | |
| parent | d1b8caf7848752ca2f69f1ecdc7791e83457c7ff (diff) | |
| download | openembedded-b5bfd7f1fd6bd34ef51701e918b40f724cb46258.tar.gz | |
propagate from branch 'org.openembedded.dev' (head d46c4661bf8a227094ce244e37836233fb938268)
to branch 'org.openembedded.dev.avr32' (head 7cd1ae5351316a6cdc9fe3db60bb05198d50af39)
Diffstat (limited to 'packages/meta/meta-toolchain.bb')
| -rw-r--r-- | packages/meta/meta-toolchain.bb | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index a734005819..58a5fb622b 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -100,6 +100,9 @@ do_populate_sdk() { done done + # add missing link to libgcc_s.so.1 + # libgcc-dev should be responsible for that, but it's not getting built + ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so # remove unwanted executables rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc @@ -108,17 +111,20 @@ do_populate_sdk() { rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la # fix pkgconfig data files - cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig - for f in *.pc ; do - sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f" - done - for f in *.pc ; do - sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f" - done - - mkdir -p ${SDK_DEPLOY} + if [ -e ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig ]; then + cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig + for f in *.pc ; do + sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f" + done + for f in *.pc ; do + sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f" + done + fi + + # package it up + mkdir -p ${SDK_DEPLOY} cd ${SDK_OUTPUT} - fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-toolchain.tar.bz2 . + fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-${TARGET_OS}-toolchain.tar.bz2 . } do_populate_sdk[nostamp] = "1" |