[oe-commits] org.oe.dev binutils: started unifing recipes to be able to fix #1465
hrw commit
openembedded-commits at lists.openembedded.org
Mon Dec 18 22:38:59 UTC 2006
binutils: started unifing recipes to be able to fix #1465
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: f499733e6db527846e1a48cf70f9862d6b3798ae
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f499733e6db527846e1a48cf70f9862d6b3798ae
Files:
1
packages/arpwatch/arpwatch_2.1a13.bb
packages/binutils/binutils.inc
packages/binutils/binutils_2.16.bb
packages/binutils/binutils_2.17.50.0.5.bb
packages/binutils/binutils_2.17.bb
Diffs:
#
# mt diff -rad9ccc1e52b486fd09144f4ef41a8f7fea1d33f4 -rf499733e6db527846e1a48cf70f9862d6b3798ae
#
#
#
# patch "packages/arpwatch/arpwatch_2.1a13.bb"
# from [c17409eea79744d05f8b6ed91fc1ac6ddc6b5f52]
# to [5ce44403a278c05129c1130826650212a1cf51ca]
#
# patch "packages/binutils/binutils.inc"
# from [3b9a03fc31e96663e9345cdd02ac69711d3c7cdd]
# to [c23725cdeb2c1671e38e52298a6ec5fed05263e8]
#
# patch "packages/binutils/binutils_2.16.bb"
# from [41bdba17e3e20ea2fcdceacf3e7e4107e7ea9267]
# to [1717ed2d1c7d8d94b2bed69019e6e0336d14bd8e]
#
# patch "packages/binutils/binutils_2.17.50.0.5.bb"
# from [6e2737f05759906543296ff88d3717d1f959af1b]
# to [9d8142c8b122fda46337a7bb572a6d1ff6061ce7]
#
# patch "packages/binutils/binutils_2.17.bb"
# from [8bddeae17d217d5234d9cfb0c577ccf907f5ce49]
# to [2fc814841cf965209d430fef1d4c3603a6e84c06]
#
============================================================
--- packages/arpwatch/arpwatch_2.1a13.bb c17409eea79744d05f8b6ed91fc1ac6ddc6b5f52
+++ packages/arpwatch/arpwatch_2.1a13.bb 5ce44403a278c05129c1130826650212a1cf51ca
@@ -5,7 +5,7 @@ RRECOMMENDS = "arpwatch-data"
DEPENDS = "fakeroot-native"
RRECOMMENDS = "arpwatch-data"
-SRC_URI = "ftp://ftp.ee.lbl.gov/arpwatch-${PV}.tar.gz \
+SRC_URI = "${DEBIAN_MIRROR}/main/pool/a/arpwatch/arpwatch-${PV}.tar.gz \
file://05debian_fhs.patch;patch=1 \
file://06debian_manpages.patch;patch=1 \
file://init.d \
============================================================
--- packages/binutils/binutils.inc 3b9a03fc31e96663e9345cdd02ac69711d3c7cdd
+++ packages/binutils/binutils.inc c23725cdeb2c1671e38e52298a6ec5fed05263e8
@@ -1,6 +1,11 @@
+DESCRIPTION = "A GNU collection of binary utilities"
+HOMEPAGE = "http://www.gnu.org/software/binutils/"
+SECTION = "devel"
+LICENSE = "GPL"
+
inherit autotools gettext
-PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+PACKAGES += "${PN}-symlinks"
FILES_${PN} = " \
${bindir}/${TARGET_PREFIX}* \
@@ -28,6 +33,9 @@ FILES_${PN}-symlinks = " \
${bindir}/size \
${bindir}/strip"
+S = "${WORKDIR}/binutils-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
--enable-shared"
============================================================
--- packages/binutils/binutils_2.16.bb 41bdba17e3e20ea2fcdceacf3e7e4107e7ea9267
+++ packages/binutils/binutils_2.16.bb 1717ed2d1c7d8d94b2bed69019e6e0336d14bd8e
@@ -1,7 +1,3 @@
-DESCRIPTION = "A GNU collection of binary utilities"
-HOMEPAGE = "http://www.gnu.org/software/binutils/"
-SECTION = "devel"
-LICENSE = "GPL"
PR = "r7"
SRC_URI = \
@@ -19,7 +15,4 @@ SRC_URI += "file://binutils-2.16-thumb-g
SRC_URI += "file://binutils-2.16-thumb-trampoline.patch;patch=1"
SRC_URI += "file://binutils-2.16-thumb-glue.patch;patch=1"
-S = "${WORKDIR}/binutils-${PV}"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
require binutils.inc
============================================================
--- packages/binutils/binutils_2.17.50.0.5.bb 6e2737f05759906543296ff88d3717d1f959af1b
+++ packages/binutils/binutils_2.17.50.0.5.bb 9d8142c8b122fda46337a7bb572a6d1ff6061ce7
@@ -1,40 +1,7 @@
-DESCRIPTION = "A GNU collection of binary utilities"
-HOMEPAGE = "http://www.gnu.org/software/binutils/"
-SECTION = "devel"
-LICENSE = "GPL"
+require binutils.inc
-inherit autotools gettext
+PR = "r1"
-PACKAGES += "${PN}-symlinks"
-
-FILES_${PN} = " \
- ${bindir}/${TARGET_PREFIX}* \
- ${libdir}/lib*-*.so \
- ${prefix}/${TARGET_SYS}/bin/*"
-
-FILES_${PN}-dev = " \
- ${includedir} \
- ${libdir}/*.a \
- ${libdir}/*.la \
- ${libdir}/libbfd.so \
- ${libdir}/libopcodes.so"
-
-FILES_${PN}-symlinks = " \
- ${bindir}/addr2line \
- ${bindir}/ar \
- ${bindir}/as \
- ${bindir}/c++filt \
- ${bindir}/gprof \
- ${bindir}/ld \
- ${bindir}/nm \
- ${bindir}/objcopy \
- ${bindir}/objdump \
- ${bindir}/ranlib \
- ${bindir}/readelf \
- ${bindir}/size \
- ${bindir}/strings \
- ${bindir}/strip"
-
SRC_URI = \
"${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
@@ -44,87 +11,3 @@ SRC_URI = \
file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
"
-
-S = "${WORKDIR}/binutils-${PV}"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
- --enable-shared"
-
-# This is necessary due to a bug in the binutils Makefiles
-EXTRA_OEMAKE = "configure-build-libiberty all"
-
-export AR = "${HOST_PREFIX}ar"
-export AS = "${HOST_PREFIX}as"
-export LD = "${HOST_PREFIX}ld"
-export NM = "${HOST_PREFIX}nm"
-export RANLIB = "${HOST_PREFIX}ranlib"
-export OBJCOPY = "${HOST_PREFIX}objcopy"
-export OBJDUMP = "${HOST_PREFIX}objdump"
-
-export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
-export AS_FOR_TARGET = "${TARGET_PREFIX}as"
-export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
-export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
-export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
-
-export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CPP_FOR_BUILD = "${BUILD_CPP}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
-
-export CC = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-
-do_configure () {
- (cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
- oe_runconf
-#
-# must prime config.cache to ensure the build of libiberty
-#
- mkdir -p ${B}/build-${BUILD_SYS}
- for i in ${CONFIG_SITE}; do
- cat $i >> ${B}/build-${BUILD_SYS}/config.cache
- 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
-
- # We don't really need these, so we'll remove them...
- rm -rf ${D}${libdir}/ldscripts
-
- # Fix the /usr/${TARGET_SYS}/bin/* links
- for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
- rm -f $l
- ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
- | tr -s / \
- | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
- done
-
- # Install the libiberty header
- install -d ${D}${includedir}
- install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
- install -m 644 ${S}/include/libiberty.h ${D}${includedir}
-
- cd ${D}${bindir}
-
- # Symlinks for ease of running these on the native target
- for p in ${TARGET_SYS}-* ; do
- ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
- done
-}
============================================================
--- packages/binutils/binutils_2.17.bb 8bddeae17d217d5234d9cfb0c577ccf907f5ce49
+++ packages/binutils/binutils_2.17.bb 2fc814841cf965209d430fef1d4c3603a6e84c06
@@ -1,7 +1,5 @@
-DESCRIPTION = "A GNU collection of binary utilities"
-HOMEPAGE = "http://www.gnu.org/software/binutils/"
-SECTION = "devel"
-LICENSE = "GPL"
+require binutils.inc
+
PR = "r0"
SRC_URI = \
@@ -24,9 +22,3 @@ SRC_URI += " file://warning-free.patch;p
# Zecke's OSX fixes
SRC_URI += " file://warning-free.patch;patch=1 "
-
-
-S = "${WORKDIR}/binutils-${PV}"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-require binutils.inc
More information about the Openembedded-commits
mailing list