[oe-commits] org.oe.dev binutils-cross.inc: Fix sysroot options, tweak staging and use for all binutils-cross versions

rpurdie commit oe at amethyst.openembedded.net
Mon Mar 17 08:59:33 UTC 2008


binutils-cross.inc: Fix sysroot options, tweak staging and use for all binutils-cross versions

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 6591174e3e2c4a49e5ee61a8b535f55ba5ba0587
ViewMTN: http://monotone.openembedded.org/revision/info/6591174e3e2c4a49e5ee61a8b535f55ba5ba0587
Files:
1
packages/binutils/binutils-cross.inc
packages/binutils/binutils-cross_2.14.90.0.6.bb
packages/binutils/binutils-cross_2.14.90.0.7.bb
packages/binutils/binutils-cross_2.15.94.0.1.bb
packages/binutils/binutils-cross_2.16.91.0.6.bb
packages/binutils/binutils-cross_2.16.91.0.7.bb
packages/binutils/binutils-cross_2.18.bb
packages/binutils/binutils-cross_csl-arm-20050416.bb
packages/binutils/binutils-cross_csl-arm-20050603.bb
Diffs:

#
# mt diff -r62c46e3d776fcf4cffa63bad351c9dfe65c27a10 -r6591174e3e2c4a49e5ee61a8b535f55ba5ba0587
#
#
#
# patch "packages/binutils/binutils-cross.inc"
#  from [73e088c7ac4cceb6a25ed245c6dd4c2d47c7a624]
#    to [2cd94e2f2a0badea3fad5a57a7b201d2480e295e]
# 
# patch "packages/binutils/binutils-cross_2.14.90.0.6.bb"
#  from [d60bed4e513253708d05f83d02aecf9ca9441369]
#    to [0b3c910b27afd69a5dfc2e1f76115ac7aca711cf]
# 
# patch "packages/binutils/binutils-cross_2.14.90.0.7.bb"
#  from [d60bed4e513253708d05f83d02aecf9ca9441369]
#    to [0b3c910b27afd69a5dfc2e1f76115ac7aca711cf]
# 
# patch "packages/binutils/binutils-cross_2.15.94.0.1.bb"
#  from [d60bed4e513253708d05f83d02aecf9ca9441369]
#    to [0b3c910b27afd69a5dfc2e1f76115ac7aca711cf]
# 
# patch "packages/binutils/binutils-cross_2.16.91.0.6.bb"
#  from [d60bed4e513253708d05f83d02aecf9ca9441369]
#    to [0b3c910b27afd69a5dfc2e1f76115ac7aca711cf]
# 
# patch "packages/binutils/binutils-cross_2.16.91.0.7.bb"
#  from [d60bed4e513253708d05f83d02aecf9ca9441369]
#    to [0b3c910b27afd69a5dfc2e1f76115ac7aca711cf]
# 
# patch "packages/binutils/binutils-cross_2.18.bb"
#  from [ede72c3f24f80082b3381b9d98618d3e8d01b1fe]
#    to [43469ada746fe0f39a037d5c52bec005015e9577]
# 
# patch "packages/binutils/binutils-cross_csl-arm-20050416.bb"
#  from [b850ee990ba59c06cb3494b64d33c14ab54afc31]
#    to [de527a6b8afb3d43245cfb19053a07ef3812dffb]
# 
# patch "packages/binutils/binutils-cross_csl-arm-20050603.bb"
#  from [9d7b8c42f13d945aafa3ec065d0d496b8949c4a5]
#    to [62ff43523623e8619766d755d123c0b44b062780]
#
============================================================
--- packages/binutils/binutils-cross.inc	73e088c7ac4cceb6a25ed245c6dd4c2d47c7a624
+++ packages/binutils/binutils-cross.inc	2cd94e2f2a0badea3fad5a57a7b201d2480e295e
@@ -3,7 +3,7 @@ PACKAGES = ""
 DEPENDS += "flex-native bison-native"
 PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-install-libbfd \
                 --disable-werror"
@@ -24,9 +24,9 @@ do_stage () {
 	rmdir ${CROSS_DIR}/${prefix} || :
 
 	# We want to move this into the target specific location
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
-	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib || \
-		mv -f ${CROSS_DIR}/lib64/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
+	mkdir -p ${STAGING_DIR_TARGET}/lib
+	mv -f ${CROSS_DIR}/lib/libiberty.a ${STAGING_DIR_TARGET}/lib/lib || \
+		mv -f ${CROSS_DIR}/lib64/libiberty.a ${STAGING_DIR_TARGET}/lib/lib
 	rmdir ${CROSS_DIR}/lib || :
 	rmdir ${CROSS_DIR}/lib64 || :
 }
============================================================
--- packages/binutils/binutils-cross_2.14.90.0.6.bb	d60bed4e513253708d05f83d02aecf9ca9441369
+++ packages/binutils/binutils-cross_2.14.90.0.6.bb	0b3c910b27afd69a5dfc2e1f76115ac7aca711cf
@@ -1,32 +1,3 @@
-SECTION = "devel"
-require binutils_${PV}.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+require binutils_${PV}.bb
+require binutils-cross.inc
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-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} || :
-	rmdir ${CROSS_DIR}/${prefix} || :
-
-	# We want to move this into the target specific location
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
-	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
-	rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
-	:
-}
============================================================
--- packages/binutils/binutils-cross_2.14.90.0.7.bb	d60bed4e513253708d05f83d02aecf9ca9441369
+++ packages/binutils/binutils-cross_2.14.90.0.7.bb	0b3c910b27afd69a5dfc2e1f76115ac7aca711cf
@@ -1,32 +1,3 @@
-SECTION = "devel"
-require binutils_${PV}.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+require binutils_${PV}.bb
+require binutils-cross.inc
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-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} || :
-	rmdir ${CROSS_DIR}/${prefix} || :
-
-	# We want to move this into the target specific location
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
-	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
-	rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
-	:
-}
============================================================
--- packages/binutils/binutils-cross_2.15.94.0.1.bb	d60bed4e513253708d05f83d02aecf9ca9441369
+++ packages/binutils/binutils-cross_2.15.94.0.1.bb	0b3c910b27afd69a5dfc2e1f76115ac7aca711cf
@@ -1,32 +1,3 @@
-SECTION = "devel"
-require binutils_${PV}.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+require binutils_${PV}.bb
+require binutils-cross.inc
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-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} || :
-	rmdir ${CROSS_DIR}/${prefix} || :
-
-	# We want to move this into the target specific location
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
-	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
-	rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
-	:
-}
============================================================
--- packages/binutils/binutils-cross_2.16.91.0.6.bb	d60bed4e513253708d05f83d02aecf9ca9441369
+++ packages/binutils/binutils-cross_2.16.91.0.6.bb	0b3c910b27afd69a5dfc2e1f76115ac7aca711cf
@@ -1,32 +1,3 @@
-SECTION = "devel"
-require binutils_${PV}.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+require binutils_${PV}.bb
+require binutils-cross.inc
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-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} || :
-	rmdir ${CROSS_DIR}/${prefix} || :
-
-	# We want to move this into the target specific location
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
-	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
-	rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
-	:
-}
============================================================
--- packages/binutils/binutils-cross_2.16.91.0.7.bb	d60bed4e513253708d05f83d02aecf9ca9441369
+++ packages/binutils/binutils-cross_2.16.91.0.7.bb	0b3c910b27afd69a5dfc2e1f76115ac7aca711cf
@@ -1,32 +1,3 @@
-SECTION = "devel"
-require binutils_${PV}.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+require binutils_${PV}.bb
+require binutils-cross.inc
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-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} || :
-	rmdir ${CROSS_DIR}/${prefix} || :
-
-	# We want to move this into the target specific location
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
-	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
-	rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
-	:
-}
============================================================
--- packages/binutils/binutils-cross_2.18.bb	ede72c3f24f80082b3381b9d98618d3e8d01b1fe
+++ packages/binutils/binutils-cross_2.18.bb	43469ada746fe0f39a037d5c52bec005015e9577
@@ -1,3 +1,4 @@
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 require binutils_${PV}.bb
 require binutils-cross.inc
+
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
============================================================
--- packages/binutils/binutils-cross_csl-arm-20050416.bb	b850ee990ba59c06cb3494b64d33c14ab54afc31
+++ packages/binutils/binutils-cross_csl-arm-20050416.bb	de527a6b8afb3d43245cfb19053a07ef3812dffb
@@ -1,32 +1,3 @@
-SECTION = "devel"
 require binutils_csl-arm-20050416.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+require binutils-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-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} || :
-	rmdir ${CROSS_DIR}/${prefix} || :
-
-	# We want to move this into the target specific location
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
-	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
-	rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
-	:
-}
============================================================
--- packages/binutils/binutils-cross_csl-arm-20050603.bb	9d7b8c42f13d945aafa3ec065d0d496b8949c4a5
+++ packages/binutils/binutils-cross_csl-arm-20050603.bb	62ff43523623e8619766d755d123c0b44b062780
@@ -1,32 +1,3 @@
-SECTION = "devel"
 require binutils_csl-arm-20050603.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+require binutils-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
-
-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} || :
-	rmdir ${CROSS_DIR}/${prefix} || :
-
-	# We want to move this into the target specific location
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
-	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
-	rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
-	:
-}






More information about the Openembedded-commits mailing list