diff options
| author |   Phil Blundell <philb@gnu.org> | 2010-02-08 16:29:30 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2010-02-08 16:29:30 +0000 |
| commit | a45a965398b942d32788404799fc6c5f5b95064a (patch) | |
| tree | 3db65caa609cc27380688d8fe0bbcf838ef1e91d | |
| parent | 61735df8d1bad00fd923326ce85ff799f5ad91b7 (diff) | |
| download | openembedded-a45a965398b942d32788404799fc6c5f5b95064a.tar.gz | |
binutils: switch to new style staging
| -rw-r--r-- | recipes/binutils/binutils-cross.inc | 21 | ||||
| -rw-r--r-- | recipes/binutils/binutils.inc | 16 |
2 files changed, 4 insertions, 33 deletions
diff --git a/recipes/binutils/binutils-cross.inc b/recipes/binutils/binutils-cross.inc index 5808c1fbda..44f042a153 100644 --- a/recipes/binutils/binutils-cross.inc +++ b/recipes/binutils/binutils-cross.inc @@ -2,28 +2,7 @@ SECTION = "devel" inherit cross DEPENDS += "flex-native bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" -PACKAGES = "" EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \ --program-prefix=${TARGET_PREFIX} \ --enable-install-libbfd \ --disable-werror" - -do_stage () { - oe_runmake install - - # We don't really need these, so we'll remove them... - rm -rf ${CROSS_DIR}/lib/ldscripts - rm -rf ${CROSS_DIR}/share/info - rm -rf ${CROSS_DIR}/share/locale - rm -rf ${CROSS_DIR}/share/man - rmdir ${CROSS_DIR}/share || : - rmdir ${CROSS_DIR}/${libdir}/gcc-lib || : - rmdir ${CROSS_DIR}/${libdir}64/gcc-lib || : - rmdir ${CROSS_DIR}/${libdir} || : - rmdir ${CROSS_DIR}/${libdir}64 || : - rmdir ${CROSS_DIR}/${prefix} || : -} - -do_install () { - : -} diff --git a/recipes/binutils/binutils.inc b/recipes/binutils/binutils.inc index 49d3aeaa3c..e7a6f58760 100644 --- a/recipes/binutils/binutils.inc +++ b/recipes/binutils/binutils.inc @@ -82,18 +82,6 @@ do_configure () { done } -do_stage () { - oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/ - oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/ - oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/ - install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/ - install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/ -} - do_install () { autotools_do_install @@ -116,11 +104,15 @@ do_install () { cd ${D}${bindir} # Symlinks for ease of running these on the native target + if [ "${HOST_SYS}" == "${TARGET_SYS}" ]; then for p in ${TARGET_SYS}-* ; do ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,` done + # update-alternatives will install these rm ${D}${bindir}/ar ${D}${bindir}/strings + + fi } |