Fix staging of binutils static libraries
PATCH 1/1 Fix staging of binutils static libraries
binutils-cross: Stage libbfd/opcodes/iberty correctly, bump PR
Changes the staging path for libbfd and libopcodes to ${CROSS_DIR}/lib. Disables staging native libiberty.a to ${STAGING_DIR_TARGET} as this doesn't make sense to do. Cleans up empty directories.
--- recipes/binutils/binutils-cross.inc | 28 +++++++++++++++++++----- recipes/binutils/binutils_2.14.90.0.6.bb | 2 +- recipes/binutils/binutils_2.14.90.0.7.bb | 2 +- recipes/binutils/binutils_2.15.94.0.1.bb | 2 +- recipes/binutils/binutils_2.16.1.bb | 2 +- recipes/binutils/binutils_2.16.91.0.6.bb | 2 +- recipes/binutils/binutils_2.16.91.0.7.bb | 2 +- recipes/binutils/binutils_2.16.bb | 2 +- recipes/binutils/binutils_2.17.50.0.1.bb | 2 +- recipes/binutils/binutils_2.17.50.0.12.bb | 2 +- recipes/binutils/binutils_2.17.50.0.5.bb | 2 +- recipes/binutils/binutils_2.17.50.0.8.bb | 2 +- recipes/binutils/binutils_2.17.bb | 2 +- recipes/binutils/binutils_2.18.50.0.7.bb | 2 +- recipes/binutils/binutils_2.18.bb | 2 +- recipes/binutils/binutils_2.19.1.bb | 2 +- recipes/binutils/binutils_2.19.bb | 2 +- recipes/binutils/binutils_csl-arm-20050416.bb | 2 +- recipes/binutils/binutils_csl-arm-20050603.bb | 2 +- recipes/binutils/binutils_cvs.bb | 2 +- 20 files changed, 41 insertions(+), 25 deletions(-)
recipes/binutils/binutils-cross.inc +22 -6
@@ -23,12 +23,28 @@ do_stage () { rmdir ${CROSS_DIR}/${libdir}64 || : rmdir ${CROSS_DIR}/${prefix} || : - # We want to move this into the target specific location - mkdir -p ${STAGING_DIR_TARGET}/lib - mv -f ${CROSS_DIR}/lib/libiberty.a ${STAGING_DIR_TARGET}/lib || \ - mv -f ${CROSS_DIR}/lib64/libiberty.a ${STAGING_DIR_TARGET}/lib - rmdir ${CROSS_DIR}/lib || : - rmdir ${CROSS_DIR}/lib64 || : + LIBBFD_DIR_BASE=${CROSS_DIR}/${BUILD_SYS}/${TARGET_SYS} + # We want to move libbfd and libopcodes to ${CROSS_DIR}/lib + mkdir -p ${CROSS_DIR}/lib + mv -f ${LIBBFD_DIR_BASE}/lib/* ${CROSS_DIR}/lib || \ + mv -f ${LIBBFD_DIR_BASE}/lib64/* ${CROSS_DIR}/lib + rmdir ${LIBBFD_DIR_BASE}/lib || : + rmdir ${LIBBFD_DIR_BASE}/lib64 || : + + # Adjust libbfd.la and libopcodes.la + for i in libbfd.la libopcodes.la; do + sed -i -e "s@${LIBBFD_DIR_BASE}/lib64@${CROSS_DIR}/lib@" ${CROSS_DIR}/lib/$i + sed -i -e "s@${LIBBFD_DIR_BASE}/lib@${CROSS_DIR}/lib@" ${CROSS_DIR}/lib/$i + done + + # libbfd headers should be moved as well + mkdir -p ${CROSS_DIR}/include + mv -f ${LIBBFD_DIR_BASE}/include/* ${CROSS_DIR}/include + rmdir ${LIBBFD_DIR_BASE}/include + + # Remove empty directories + rmdir ${CROSS_DIR}/${BUILD_SYS}/${TARGET_SYS} || : + rmdir ${CROSS_DIR}/${BUILD_SYS} || : } do_install () {
recipes/binutils/binutils_2.14.90.0.6.bb +1 -1
@@ -1,7 +1,7 @@ SECTION = "devel" inherit autotools gettext -PR = "r5" +PR = "r6" DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/"
recipes/binutils/binutils_2.14.90.0.7.bb +1 -1
@@ -4,7 +4,7 @@ inherit autotools gettext DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" -PR = "r6" +PR = "r7" PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
recipes/binutils/binutils_2.15.94.0.1.bb +1 -1
@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" -PR = "r5" +PR = "r6" inherit autotools gettext
recipes/binutils/binutils_2.16.1.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" CROSSTOOL_PATCH_URL = "http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/" SRC_URI = \
recipes/binutils/binutils_2.16.91.0.6.bb +1 -1
@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" -PR = "r3" +PR = "r4" # glibc 2.3 has issues with this version # of binutils.
recipes/binutils/binutils_2.16.91.0.7.bb +1 -1
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" -PR = "r2" +PR = "r3" inherit autotools gettext
recipes/binutils/binutils_2.16.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" SRC_URI = \ "${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
recipes/binutils/binutils_2.17.50.0.1.bb +1 -1
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" -PR = "r2" +PR = "r3" inherit autotools gettext
recipes/binutils/binutils_2.17.50.0.12.bb +1 -1
@@ -1,5 +1,5 @@ require binutils.inc -PR = "r2" +PR = "r3" SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
recipes/binutils/binutils_2.17.50.0.5.bb +1 -1
@@ -1,6 +1,6 @@ require binutils.inc -PR = "r3" +PR = "r4" SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
recipes/binutils/binutils_2.17.50.0.8.bb +1 -1
@@ -1,6 +1,6 @@ require binutils.inc -PR = "r2" +PR = "r3" SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
recipes/binutils/binutils_2.17.bb +1 -1
@@ -1,7 +1,7 @@ require binutils.inc require binutils-avr32.inc -PR = "r6" +PR = "r7" SRC_URI = \ "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
recipes/binutils/binutils_2.18.50.0.7.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" require binutils.inc
recipes/binutils/binutils_2.18.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require binutils.inc
recipes/binutils/binutils_2.19.1.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" require binutils.inc
recipes/binutils/binutils_2.19.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" require binutils.inc
recipes/binutils/binutils_csl-arm-20050416.bb +1 -1
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "2.15.99+csl-arm+cvs20050416" -PR = "r3" +PR = "r4" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_arm-linux = "-1"
recipes/binutils/binutils_csl-arm-20050603.bb +1 -1
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "2.15.99+csl-arm+cvs20050603" -PR = "r3" +PR = "r4" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE_arm-linux = "1"
recipes/binutils/binutils_cvs.bb +1 -1
@@ -1,6 +1,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "0.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" require binutils.inc
Signature · 4 lines
1.6.0.4 -- Tom Rini
Great patch.
I wonder whether we really need to keep all those binutils versions though...
:M:
Quoted 8 lines · Tom Rini
binutils-cross: Stage libbfd/opcodes/iberty correctly, bump PR
Changes the staging path for libbfd and libopcodes to ${CROSS_DIR}/lib. Disables staging native libiberty.a to ${STAGING_DIR_TARGET} as this doesn't make sense to do. Cleans up empty directories.
Signed-off-by Nikita Shulga <[email protected]>Signed-off-by Tom Rini <[email protected]>
I got a 'great patch' from Mickey and no Acked-bys. Ping.
Quoted 291 lines
--- recipes/binutils/binutils-cross.inc | 28 +++++++++++++++++++----- recipes/binutils/binutils_2.14.90.0.6.bb | 2 +- recipes/binutils/binutils_2.14.90.0.7.bb | 2 +- recipes/binutils/binutils_2.15.94.0.1.bb | 2 +- recipes/binutils/binutils_2.16.1.bb | 2 +- recipes/binutils/binutils_2.16.91.0.6.bb | 2 +- recipes/binutils/binutils_2.16.91.0.7.bb | 2 +- recipes/binutils/binutils_2.16.bb | 2 +- recipes/binutils/binutils_2.17.50.0.1.bb | 2 +- recipes/binutils/binutils_2.17.50.0.12.bb | 2 +- recipes/binutils/binutils_2.17.50.0.5.bb | 2 +- recipes/binutils/binutils_2.17.50.0.8.bb | 2 +- recipes/binutils/binutils_2.17.bb | 2 +- recipes/binutils/binutils_2.18.50.0.7.bb | 2 +- recipes/binutils/binutils_2.18.bb | 2 +- recipes/binutils/binutils_2.19.1.bb | 2 +- recipes/binutils/binutils_2.19.bb | 2 +- recipes/binutils/binutils_csl-arm-20050416.bb | 2 +- recipes/binutils/binutils_csl-arm-20050603.bb | 2 +- recipes/binutils/binutils_cvs.bb | 2 +- 20 files changed, 41 insertions(+), 25 deletions(-)recipes/binutils/binutils-cross.inc +22
-6@@ -23,12 +23,28 @@ do_stage () { rmdir ${CROSS_DIR}/${libdir}64 || : rmdir ${CROSS_DIR}/${prefix} || : - # We want to move this into the target specific location - mkdir -p ${STAGING_DIR_TARGET}/lib - mv -f ${CROSS_DIR}/lib/libiberty.a ${STAGING_DIR_TARGET}/lib || \ - mv -f ${CROSS_DIR}/lib64/libiberty.a ${STAGING_DIR_TARGET}/lib - rmdir ${CROSS_DIR}/lib || : - rmdir ${CROSS_DIR}/lib64 || : + LIBBFD_DIR_BASE=${CROSS_DIR}/${BUILD_SYS}/${TARGET_SYS} + # We want to move libbfd and libopcodes to ${CROSS_DIR}/lib + mkdir -p ${CROSS_DIR}/lib + mv -f ${LIBBFD_DIR_BASE}/lib/* ${CROSS_DIR}/lib || \ + mv -f ${LIBBFD_DIR_BASE}/lib64/* ${CROSS_DIR}/lib + rmdir ${LIBBFD_DIR_BASE}/lib || : + rmdir ${LIBBFD_DIR_BASE}/lib64 || : + + # Adjust libbfd.la and libopcodes.la + for i in libbfd.la libopcodes.la; do + sed -i -e "s@${LIBBFD_DIR_BASE}/lib64@${CROSS_DIR}/lib@" ${CROSS_DIR}/lib/$i + sed -i -e "s@${LIBBFD_DIR_BASE}/lib@${CROSS_DIR}/lib@" ${CROSS_DIR}/lib/$i + done + + # libbfd headers should be moved as well + mkdir -p ${CROSS_DIR}/include + mv -f ${LIBBFD_DIR_BASE}/include/* ${CROSS_DIR}/include + rmdir ${LIBBFD_DIR_BASE}/include + + # Remove empty directories + rmdir ${CROSS_DIR}/${BUILD_SYS}/${TARGET_SYS} || : + rmdir ${CROSS_DIR}/${BUILD_SYS} || : } do_install () {recipes/binutils/binutils_2.14.90.0.6.bb +1
-1@@ -1,7 +1,7 @@ SECTION = "devel" inherit autotools gettext -PR = "r5" +PR = "r6" DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/"recipes/binutils/binutils_2.14.90.0.7.bb +1
-1@@ -4,7 +4,7 @@ inherit autotools gettext DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" -PR = "r6" +PR = "r7" PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"recipes/binutils/binutils_2.15.94.0.1.bb +1
-1@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" -PR = "r5" +PR = "r6" inherit autotools gettextrecipes/binutils/binutils_2.16.1.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" CROSSTOOL_PATCH_URL = "http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/" SRC_URI = \recipes/binutils/binutils_2.16.91.0.6.bb +1
-1@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" -PR = "r3" +PR = "r4" # glibc 2.3 has issues with this version # of binutils.recipes/binutils/binutils_2.16.91.0.7.bb +1
-1@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" -PR = "r2" +PR = "r3" inherit autotools gettextrecipes/binutils/binutils_2.16.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" SRC_URI = \ "${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.50.0.1.bb +1
-1@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" -PR = "r2" +PR = "r3" inherit autotools gettextrecipes/binutils/binutils_2.17.50.0.12.bb +1
-1@@ -1,5 +1,5 @@ require binutils.inc -PR = "r2" +PR = "r3" SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.50.0.5.bb +1
-1@@ -1,6 +1,6 @@ require binutils.inc -PR = "r3" +PR = "r4" SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.50.0.8.bb +1
-1@@ -1,6 +1,6 @@ require binutils.inc -PR = "r2" +PR = "r3" SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.bb +1
-1@@ -1,7 +1,7 @@ require binutils.inc require binutils-avr32.inc -PR = "r6" +PR = "r7" SRC_URI = \ "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.18.50.0.7.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" require binutils.increcipes/binutils/binutils_2.18.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require binutils.increcipes/binutils/binutils_2.19.1.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" require binutils.increcipes/binutils/binutils_2.19.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" require binutils.increcipes/binutils/binutils_csl-arm-20050416.bb +1
-1@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "2.15.99+csl-arm+cvs20050416" -PR = "r3" +PR = "r4" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_arm-linux = "-1"recipes/binutils/binutils_csl-arm-20050603.bb +1
-1@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "2.15.99+csl-arm+cvs20050603" -PR = "r3" +PR = "r4" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE_arm-linux = "1"recipes/binutils/binutils_cvs.bb +1
-1@@ -1,6 +1,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "0.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" require binutils.incSignature · 4 lines
1.6.0.4 -- Tom Rini
Signature · 1 line
Tom Rini
Hi Tom,
An INC_PR adjustment fits quite well in this case, doesn't it ;-)
Quoted 313 lines · Tom Rini
Quoted 8 lines · Tom Rini
binutils-cross: Stage libbfd/opcodes/iberty correctly, bump PR
Changes the staging path for libbfd and libopcodes to ${CROSS_DIR}/lib. Disables staging native libiberty.a to ${STAGING_DIR_TARGET} as this doesn't make sense to do. Cleans up empty directories.
Signed-off-by Nikita Shulga <[email protected]>Signed-off-by Tom Rini <[email protected]>I got a 'great patch' from Mickey and no Acked-bys. Ping.
Quoted 284 lines
---
recipes/binutils/binutils-cross.inc | 28 +++++++++++++++++++-----recipes/binutils/binutils_2.14.90.0.6.bb | 2 +- recipes/binutils/binutils_2.14.90.0.7.bb | 2 +- recipes/binutils/binutils_2.15.94.0.1.bb | 2 +-recipes/binutils/binutils_2.16.1.bb | 2 +- recipes/binutils/binutils_2.16.91.0.6.bb | 2 +- recipes/binutils/binutils_2.16.91.0.7.bb | 2 +- recipes/binutils/binutils_2.16.bb | 2 +- recipes/binutils/binutils_2.17.50.0.1.bb | 2 +- recipes/binutils/binutils_2.17.50.0.12.bb | 2 +- recipes/binutils/binutils_2.17.50.0.5.bb | 2 +- recipes/binutils/binutils_2.17.50.0.8.bb | 2 +- recipes/binutils/binutils_2.17.bb | 2 +- recipes/binutils/binutils_2.18.50.0.7.bb | 2 +- recipes/binutils/binutils_2.18.bb | 2 +- recipes/binutils/binutils_2.19.1.bb | 2 +- recipes/binutils/binutils_2.19.bb | 2 +- recipes/binutils/binutils_csl-arm-20050416.bb | 2 +- recipes/binutils/binutils_csl-arm-20050603.bb | 2 +- recipes/binutils/binutils_cvs.bb | 2 +-
20 files changed, 41 insertions(+), 25 deletions(-)recipes/binutils/binutils-cross.inc +0
-0@@ -23,12 +23,28 @@ do_stage () {rmdir ${CROSS_DIR}/${libdir}64 || :
rmdir ${CROSS_DIR}/${prefix} || :- # We want to move this into the target specific location
- mkdir -p ${STAGING_DIR_TARGET}/lib
- mv -f ${CROSS_DIR}/lib/libiberty.a ${STAGING_DIR_TARGET}/lib || \
- mv -f ${CROSS_DIR}/lib64/libiberty.a ${STAGING_DIR_TARGET}/lib
- rmdir ${CROSS_DIR}/lib || :
- rmdir ${CROSS_DIR}/lib64 || :
+ LIBBFD_DIR_BASE=${CROSS_DIR}/${BUILD_SYS}/${TARGET_SYS}
+ # We want to move libbfd and libopcodes to ${CROSS_DIR}/lib
+ mkdir -p ${CROSS_DIR}/lib
+ mv -f ${LIBBFD_DIR_BASE}/lib/* ${CROSS_DIR}/lib || \
+ mv -f ${LIBBFD_DIR_BASE}/lib64/* ${CROSS_DIR}/lib
+ rmdir ${LIBBFD_DIR_BASE}/lib || :
+ rmdir ${LIBBFD_DIR_BASE}/lib64 || :recipes/binutils/binutils-cross.inc +15
-0+ + # Adjust libbfd.la and libopcodes.la + for i in libbfd.la libopcodes.la; do + sed -i -e "s@${LIBBFD_DIR_BASE}/lib64@${CROSS_DIR}/lib@" ${CROSS_DIR}/lib/$i + sed -i -e "s@${LIBBFD_DIR_BASE}/lib@${CROSS_DIR}/lib@" ${CROSS_DIR}/lib/$i + done + + # libbfd headers should be moved as well + mkdir -p ${CROSS_DIR}/include + mv -f ${LIBBFD_DIR_BASE}/include/* ${CROSS_DIR}/include + rmdir ${LIBBFD_DIR_BASE}/include + + # Remove empty directories + rmdir ${CROSS_DIR}/${BUILD_SYS}/${TARGET_SYS} || : + rmdir ${CROSS_DIR}/${BUILD_SYS} || :}
do_install () {
recipes/binutils/binutils_2.14.90.0.6.bb +0
-0@@ -1,7 +1,7 @@SECTION = "devel"
inherit autotools gettextrecipes/binutils/binutils_2.14.90.0.6.bb +1
-1-PR = "r5" +PR = "r6"DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/"
recipes/binutils/binutils_2.14.90.0.7.bb +0
-0@@ -4,7 +4,7 @@ inherit autotools gettextDESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL"
recipes/binutils/binutils_2.14.90.0.7.bb +1
-1-PR = "r6" +PR = "r7"PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
recipes/binutils/binutils_2.15.94.0.1.bb +0
-0@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities"HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel"
LICENSE = "GPL"recipes/binutils/binutils_2.15.94.0.1.bb +1
-1-PR = "r5" +PR = "r6"inherit autotools gettext
recipes/binutils/binutils_2.16.1.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2"CROSSTOOL_PATCH_URL = "http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/"
SRC_URI= \recipes/binutils/binutils_2.16.91.0.6.bb +0
-0@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities"HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel"
LICENSE = "GPL"recipes/binutils/binutils_2.16.91.0.6.bb +1
-1-PR = "r3" +PR = "r4"# glibc 2.3 has issues with this version # of binutils.recipes/binutils/binutils_2.16.91.0.7.bb +0
-0@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"SECTION = "devel"
LICENSE = "GPL"
DEFAULT_PREFERENCE = "-1"recipes/binutils/binutils_2.16.91.0.7.bb +1
-1-PR = "r2" +PR = "r3"inherit autotools gettext
recipes/binutils/binutils_2.16.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" SRC_URI = \ "${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.50.0.1.bb +0
-0@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"SECTION = "devel"
LICENSE = "GPL"
DEFAULT_PREFERENCE = "-1"recipes/binutils/binutils_2.17.50.0.1.bb +1
-1-PR = "r2" +PR = "r3"inherit autotools gettext
recipes/binutils/binutils_2.17.50.0.12.bb +0
-0@@ -1,5 +1,5 @@require binutils.inc
recipes/binutils/binutils_2.17.50.0.12.bb +1
-1-PR = "r2" +PR = "r3"SRC_URI = \
"${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.50.0.5.bb +0
-0@@ -1,6 +1,6 @@require binutils.inc
recipes/binutils/binutils_2.17.50.0.5.bb +1
-1-PR = "r3" +PR = "r4"SRC_URI = \
"${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.50.0.8.bb +0
-0@@ -1,6 +1,6 @@require binutils.inc
recipes/binutils/binutils_2.17.50.0.8.bb +1
-1-PR = "r2" +PR = "r3"SRC_URI = \
"${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.bb +0
-0@@ -1,7 +1,7 @@require binutils.inc
require binutils-avr32.increcipes/binutils/binutils_2.17.bb +1
-1-PR = "r6" +PR = "r7"SRC_URI = \
"http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.18.50.0.7.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7"require binutils.inc
recipes/binutils/binutils_2.18.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5"require binutils.inc
recipes/binutils/binutils_2.19.1.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1"require binutils.inc
recipes/binutils/binutils_2.19.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2"require binutils.inc
recipes/binutils/binutils_csl-arm-20050416.bb +0
-0@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"LICENSE = "GPL"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "2.15.99+csl-arm+cvs20050416"recipes/binutils/binutils_csl-arm-20050416.bb +1
-1-PR = "r3" +PR = "r4"OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
DEFAULT_PREFERENCE= "-1" DEFAULT_PREFERENCE_arm-linux = "-1"recipes/binutils/binutils_csl-arm-20050603.bb +0
-0@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"LICENSE = "GPL"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "2.15.99+csl-arm+cvs20050603"recipes/binutils/binutils_csl-arm-20050603.bb +1
-1-PR = "r3" +PR = "r4"OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
DEFAULT_PREFERENCE= "-1" #DEFAULT_PREFERENCE_arm-linux = "1"recipes/binutils/binutils_cvs.bb +0
-0@@ -1,6 +1,6 @@FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "0.0+cvs${SRCDATE}"
recipes/binutils/binutils_cvs.bb +1
-1-PR = "r0" +PR = "r1"Quoted 7 lines
require binutils.inc
--
1.6.0.4--
Tom Rini--
Tom Rini_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Quoted 288 lines · Tom Rini
binutils-cross: Stage libbfd/opcodes/iberty correctly, bump PR
Changes the staging path for libbfd and libopcodes to ${CROSS_DIR}/lib. Disables staging native libiberty.a to ${STAGING_DIR_TARGET} as this doesn't make sense to do. Cleans up empty directories.
Signed-off-by Nikita Shulga <[email protected]>Signed-off-by Tom Rini <[email protected]>--- recipes/binutils/binutils-cross.inc | 28 +++++++++++++++++++----- recipes/binutils/binutils_2.14.90.0.6.bb | 2 +- recipes/binutils/binutils_2.14.90.0.7.bb | 2 +- recipes/binutils/binutils_2.15.94.0.1.bb | 2 +- recipes/binutils/binutils_2.16.1.bb | 2 +- recipes/binutils/binutils_2.16.91.0.6.bb | 2 +- recipes/binutils/binutils_2.16.91.0.7.bb | 2 +- recipes/binutils/binutils_2.16.bb | 2 +- recipes/binutils/binutils_2.17.50.0.1.bb | 2 +- recipes/binutils/binutils_2.17.50.0.12.bb | 2 +- recipes/binutils/binutils_2.17.50.0.5.bb | 2 +- recipes/binutils/binutils_2.17.50.0.8.bb | 2 +- recipes/binutils/binutils_2.17.bb | 2 +- recipes/binutils/binutils_2.18.50.0.7.bb | 2 +- recipes/binutils/binutils_2.18.bb | 2 +- recipes/binutils/binutils_2.19.1.bb | 2 +- recipes/binutils/binutils_2.19.bb | 2 +- recipes/binutils/binutils_csl-arm-20050416.bb | 2 +- recipes/binutils/binutils_csl-arm-20050603.bb | 2 +- recipes/binutils/binutils_cvs.bb | 2 +- 20 files changed, 41 insertions(+), 25 deletions(-)recipes/binutils/binutils-cross.inc +22
-6@@ -23,12 +23,28 @@ do_stage () { rmdir ${CROSS_DIR}/${libdir}64 || : rmdir ${CROSS_DIR}/${prefix} || : - # We want to move this into the target specific location - mkdir -p ${STAGING_DIR_TARGET}/lib - mv -f ${CROSS_DIR}/lib/libiberty.a ${STAGING_DIR_TARGET}/lib || \ - mv -f ${CROSS_DIR}/lib64/libiberty.a ${STAGING_DIR_TARGET}/lib - rmdir ${CROSS_DIR}/lib || : - rmdir ${CROSS_DIR}/lib64 || : + LIBBFD_DIR_BASE=${CROSS_DIR}/${BUILD_SYS}/${TARGET_SYS} + # We want to move libbfd and libopcodes to ${CROSS_DIR}/lib + mkdir -p ${CROSS_DIR}/lib + mv -f ${LIBBFD_DIR_BASE}/lib/* ${CROSS_DIR}/lib || \ + mv -f ${LIBBFD_DIR_BASE}/lib64/* ${CROSS_DIR}/lib + rmdir ${LIBBFD_DIR_BASE}/lib || : + rmdir ${LIBBFD_DIR_BASE}/lib64 || : + + # Adjust libbfd.la and libopcodes.la + for i in libbfd.la libopcodes.la; do + sed -i -e "s@${LIBBFD_DIR_BASE}/lib64@${CROSS_DIR}/lib@" ${CROSS_DIR}/lib/$i + sed -i -e "s@${LIBBFD_DIR_BASE}/lib@${CROSS_DIR}/lib@" ${CROSS_DIR}/lib/$i + done + + # libbfd headers should be moved as well + mkdir -p ${CROSS_DIR}/include + mv -f ${LIBBFD_DIR_BASE}/include/* ${CROSS_DIR}/include + rmdir ${LIBBFD_DIR_BASE}/include + + # Remove empty directories + rmdir ${CROSS_DIR}/${BUILD_SYS}/${TARGET_SYS} || : + rmdir ${CROSS_DIR}/${BUILD_SYS} || : } do_install () {recipes/binutils/binutils_2.14.90.0.6.bb +1
-1@@ -1,7 +1,7 @@ SECTION = "devel" inherit autotools gettext -PR = "r5" +PR = "r6" DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/"recipes/binutils/binutils_2.14.90.0.7.bb +1
-1@@ -4,7 +4,7 @@ inherit autotools gettext DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" -PR = "r6" +PR = "r7" PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"recipes/binutils/binutils_2.15.94.0.1.bb +1
-1@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" -PR = "r5" +PR = "r6" inherit autotools gettextrecipes/binutils/binutils_2.16.1.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" CROSSTOOL_PATCH_URL = "http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/" SRC_URI = \recipes/binutils/binutils_2.16.91.0.6.bb +1
-1@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" -PR = "r3" +PR = "r4" # glibc 2.3 has issues with this version # of binutils.recipes/binutils/binutils_2.16.91.0.7.bb +1
-1@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" -PR = "r2" +PR = "r3" inherit autotools gettextrecipes/binutils/binutils_2.16.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" SRC_URI = \ "${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.50.0.1.bb +1
-1@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" -PR = "r2" +PR = "r3" inherit autotools gettextrecipes/binutils/binutils_2.17.50.0.12.bb +1
-1@@ -1,5 +1,5 @@ require binutils.inc -PR = "r2" +PR = "r3" SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.50.0.5.bb +1
-1@@ -1,6 +1,6 @@ require binutils.inc -PR = "r3" +PR = "r4" SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.50.0.8.bb +1
-1@@ -1,6 +1,6 @@ require binutils.inc -PR = "r2" +PR = "r3" SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.17.bb +1
-1@@ -1,7 +1,7 @@ require binutils.inc require binutils-avr32.inc -PR = "r6" +PR = "r7" SRC_URI = \ "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \recipes/binutils/binutils_2.18.50.0.7.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" require binutils.increcipes/binutils/binutils_2.18.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require binutils.increcipes/binutils/binutils_2.19.1.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" require binutils.increcipes/binutils/binutils_2.19.bb +1
-1@@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" require binutils.increcipes/binutils/binutils_csl-arm-20050416.bb +1
-1@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "2.15.99+csl-arm+cvs20050416" -PR = "r3" +PR = "r4" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_arm-linux = "-1"recipes/binutils/binutils_csl-arm-20050603.bb +1
-1@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "2.15.99+csl-arm+cvs20050603" -PR = "r3" +PR = "r4" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE_arm-linux = "1"recipes/binutils/binutils_cvs.bb +0
-0
recipes/binutils/binutils_cvs.bb line 6
Quoted 7 lines
recipes/binutils/binutils_cvs.bb +1
-1@@ -1,6 +1,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "0.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" require binutils.inc
seems ok. I hope you have tested it on 64 bit hosts as well.
Signature · 1 line
Khem Raj
Quoted 9 lines · Khem Raj
Quoted 8 lines · Tom Rini
binutils-cross: Stage libbfd/opcodes/iberty correctly, bump PR
Changes the staging path for libbfd and libopcodes to ${CROSS_DIR}/lib. Disables staging native libiberty.a to ${STAGING_DIR_TARGET} as this doesn't make sense to do. Cleans up empty directories.
Signed-off-by Nikita Shulga <[email protected]>Signed-off-by Tom Rini <[email protected]>
[snip]
Quoted 1 line
seems ok. I hope you have tested it on 64 bit hosts as well.
OK, found a problem. gcc-configure-cross.inc's do_stage will go and delete the libiberty.a we put here, after overwriting it with libiberty.a from gcc. There's a comment about wanting libiberty.a from binutils. Anyone recall why?
Signature · 1 line
Tom Rini
Quoted 10 lines · Tom Rini
Quoted 9 lines · Khem Raj
Quoted 8 lines · Tom Rini
binutils-cross: Stage libbfd/opcodes/iberty correctly, bump PR
Changes the staging path for libbfd and libopcodes to ${CROSS_DIR}/lib. Disables staging native libiberty.a to ${STAGING_DIR_TARGET} as this doesn't make sense to do. Cleans up empty directories.
Signed-off-by Nikita Shulga <[email protected]>Signed-off-by Tom Rini <[email protected]>
Quoted 7 lines
[snip]
Quoted 1 line
seems ok. I hope you have tested it on 64 bit hosts as well.
OK, found a problem. gcc-configure-cross.inc's
do_stagewill go and delete the libiberty.a we put here, after overwriting it with libiberty.a from gcc. There's a comment about wanting libiberty.a from binutils. Anyone recall why?
IIRC both libraries were not same and some programs (e.g. ksymoops) used binutils provided library. That may not be the case anymore now you have to check
I think avoiding to package static library would be an option to consider.
Quoted 4 lines
--
Tom Rini