diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-03 21:51:32 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-03 21:51:32 +0000 |
commit | 7d542955fe0d78730e280e586a03daffd3c1d527 (patch) | |
tree | 96e9607021e6a73d040a986b12d053a3170dfbc2 | |
parent | 79546c8dd2e0f2e90eb663cfcf3e4cf58d09086e (diff) | |
parent | 4847e67a9d7017db9a9e83d849e9f98c8a9b5ad9 (diff) |
explicit_merge of '4971f280898b867f9204503887a01d98da03a5fe'
and '36675cca3be4193a8fa55cfa1dba9a78038b7d92'
using ancestor ''
to branch 'org.openembedded.dev'
-rw-r--r-- | packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb | 2 | ||||
-rw-r--r-- | packages/binutils/binutils.inc | 10 | ||||
-rw-r--r-- | packages/binutils/binutils_2.16.bb | 13 |
3 files changed, 22 insertions, 3 deletions
diff --git a/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb b/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb index 65130e6345..7b51227cde 100644 --- a/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb +++ b/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb @@ -1,5 +1,5 @@ SECTION = "devel" -PR = "r2" +PR = "r1" include binutils_${PV}.bb inherit sdk DEPENDS += "flex-native bison-native" diff --git a/packages/binutils/binutils.inc b/packages/binutils/binutils.inc index 938fc5754e..680e579a06 100644 --- a/packages/binutils/binutils.inc +++ b/packages/binutils/binutils.inc @@ -63,7 +63,15 @@ do_configure () { } do_stage () { - autotools_stage_all + 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 () { diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb index d852a2b658..bb66ca6741 100644 --- a/packages/binutils/binutils_2.16.bb +++ b/packages/binutils/binutils_2.16.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -PR = "r4" +PR = "r3" SRC_URI = \ "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \ @@ -19,7 +19,18 @@ SRC_URI += "file://binutils-2.16-linux-uclibc.patch;patch=1" SRC_URI += "file://binutils-2.16-thumb-trampoline.patch;patch=1" SRC_URI += "file://binutils-2.16-thumb-glue.patch;patch=1" +#to be removed: +# this patch does not seem to do anything any longer +#SRC_URI += "file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1" + S = "${WORKDIR}/binutils-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" include binutils.inc + +#to be removed: +# This was not doing anything because it used the ${B} directory and there +# was no configure.ac or configure.in in there. +#do_configure_prepend() { +# for dir in bfd gas ld; do ( cd $dir; autoreconf ); done +#} |