From a15379c569c48b79583cfd16e87b3997b192a602 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 15 Mar 2008 11:20:16 +0000
Subject: binutils-cross.inc: Fix sysroot options, tweak staging and use for
 all binutils-cross versions

---
 packages/binutils/binutils-cross.inc               |  8 +++---
 packages/binutils/binutils-cross_2.14.90.0.6.bb    | 33 ++--------------------
 packages/binutils/binutils-cross_2.14.90.0.7.bb    | 33 ++--------------------
 packages/binutils/binutils-cross_2.15.94.0.1.bb    | 33 ++--------------------
 packages/binutils/binutils-cross_2.16.91.0.6.bb    | 33 ++--------------------
 packages/binutils/binutils-cross_2.16.91.0.7.bb    | 33 ++--------------------
 packages/binutils/binutils-cross_2.18.bb           |  3 +-
 .../binutils/binutils-cross_csl-arm-20050416.bb    | 31 +-------------------
 .../binutils/binutils-cross_csl-arm-20050603.bb    | 31 +-------------------
 9 files changed, 18 insertions(+), 220 deletions(-)

(limited to 'packages')

diff --git a/packages/binutils/binutils-cross.inc b/packages/binutils/binutils-cross.inc
index 642d5318e7..63e5cf6a62 100644
--- a/packages/binutils/binutils-cross.inc
+++ b/packages/binutils/binutils-cross.inc
@@ -3,7 +3,7 @@ inherit cross
 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 || :
 }
diff --git a/packages/binutils/binutils-cross_2.14.90.0.6.bb b/packages/binutils/binutils-cross_2.14.90.0.6.bb
index 1f2f43ecf8..d245f7d11a 100644
--- a/packages/binutils/binutils-cross_2.14.90.0.6.bb
+++ b/packages/binutils/binutils-cross_2.14.90.0.6.bb
@@ -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}"
-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 () {
-	:
-}
+require binutils_${PV}.bb
+require binutils-cross.inc
diff --git a/packages/binutils/binutils-cross_2.14.90.0.7.bb b/packages/binutils/binutils-cross_2.14.90.0.7.bb
index 1f2f43ecf8..d245f7d11a 100644
--- a/packages/binutils/binutils-cross_2.14.90.0.7.bb
+++ b/packages/binutils/binutils-cross_2.14.90.0.7.bb
@@ -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}"
-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 () {
-	:
-}
+require binutils_${PV}.bb
+require binutils-cross.inc
diff --git a/packages/binutils/binutils-cross_2.15.94.0.1.bb b/packages/binutils/binutils-cross_2.15.94.0.1.bb
index 1f2f43ecf8..d245f7d11a 100644
--- a/packages/binutils/binutils-cross_2.15.94.0.1.bb
+++ b/packages/binutils/binutils-cross_2.15.94.0.1.bb
@@ -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}"
-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 () {
-	:
-}
+require binutils_${PV}.bb
+require binutils-cross.inc
diff --git a/packages/binutils/binutils-cross_2.16.91.0.6.bb b/packages/binutils/binutils-cross_2.16.91.0.6.bb
index 1f2f43ecf8..d245f7d11a 100644
--- a/packages/binutils/binutils-cross_2.16.91.0.6.bb
+++ b/packages/binutils/binutils-cross_2.16.91.0.6.bb
@@ -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}"
-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 () {
-	:
-}
+require binutils_${PV}.bb
+require binutils-cross.inc
diff --git a/packages/binutils/binutils-cross_2.16.91.0.7.bb b/packages/binutils/binutils-cross_2.16.91.0.7.bb
index 1f2f43ecf8..d245f7d11a 100644
--- a/packages/binutils/binutils-cross_2.16.91.0.7.bb
+++ b/packages/binutils/binutils-cross_2.16.91.0.7.bb
@@ -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}"
-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 () {
-	:
-}
+require binutils_${PV}.bb
+require binutils-cross.inc
diff --git a/packages/binutils/binutils-cross_2.18.bb b/packages/binutils/binutils-cross_2.18.bb
index a418dfaab5..b78a30ac47 100644
--- a/packages/binutils/binutils-cross_2.18.bb
+++ b/packages/binutils/binutils-cross_2.18.bb
@@ -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}"
+
diff --git a/packages/binutils/binutils-cross_csl-arm-20050416.bb b/packages/binutils/binutils-cross_csl-arm-20050416.bb
index 2b04e83295..55fa3231f2 100644
--- a/packages/binutils/binutils-cross_csl-arm-20050416.bb
+++ b/packages/binutils/binutils-cross_csl-arm-20050416.bb
@@ -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 () {
-	:
-}
diff --git a/packages/binutils/binutils-cross_csl-arm-20050603.bb b/packages/binutils/binutils-cross_csl-arm-20050603.bb
index 83eec9b9c6..e15b63e0f0 100644
--- a/packages/binutils/binutils-cross_csl-arm-20050603.bb
+++ b/packages/binutils/binutils-cross_csl-arm-20050603.bb
@@ -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 () {
-	:
-}
-- 
cgit v1.2.3