gcc: Clean up FILESDIR settings (move to gcc-common.inc)

diff --git a/packages/gcc/gcc-common.inc b/packages/gcc/gcc-common.inc
index b066434cfdbc5cb0d952077379e722f7156191e0..36a491af7238c5eef058520f6d18cabd809f804e 100644 (file)
--- a/packages/gcc/gcc-common.inc
+++ b/packages/gcc/gcc-common.inc
@@ -5,6 +5,8 @@ LICENSE = "GPL"
 
 inherit autotools gettext
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
+
 def get_gcc_fpu_setting(bb, d):
     if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
         return "--with-float=soft"

diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index 2569a97d0385bd828c1482c3501cece681316245..4f98905b1775e81615f3d06e8bd295327bc72222 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb
@@ -4,8 +4,6 @@ PR = "r3"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 

diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb
index cb31e09e7e5880dde8d8817a104e8d5f204d88e3..739c589d2bd6ddcf342fb072a2dbebf78efb42e6 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_3.4.3.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb
@@ -4,8 +4,6 @@ PR = "r1"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 

diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb
index 2569a97d0385bd828c1482c3501cece681316245..4f98905b1775e81615f3d06e8bd295327bc72222 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb
@@ -4,8 +4,6 @@ PR = "r3"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 

diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb
index 0ea1761d8c2f2b6ae597bc35f0ed9c2afc85b717..a6f0157428fae4b9ffc03d576306a7bc426321b1 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.1.0.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb
@@ -4,8 +4,6 @@ PR = "r2"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 

diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb
index cb478492a6b55d0f666fe8843f7617285aeecb42..069a524ed0b28e0425ef4ae08d7e1d52b69cad53 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb
@@ -2,8 +2,6 @@ PR = "r3"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 

diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb
index 28864f12da685fc9e5a8626aaa7561058ff286f8..ce58198734197ccaefc8f57eaf8246a19bd251b5 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -2,8 +2,6 @@ PR = "r5"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 
 require gcc-${PV}.inc

diff --git a/packages/gcc/gcc-cross-sdk_4.2.2.bb b/packages/gcc/gcc-cross-sdk_4.2.2.bb
index 46ceef772532f8ac83f6578eac568746b099f280..6bdf60b2177eba2f9e16c6bb2eb0959f00ccd795 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_4.2.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.2.bb
@@ -2,8 +2,6 @@ PR = "r3"
 
 inherit sdk
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 PACKAGES = "${PN}"
 
 require gcc-${PV}.inc

diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index 068fcffe3bf7a0aa6992fc424086a42c32eaca7a..5fb22c92bdefa927da85c4bc4b59493f8a3e3554 100644 (file)
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -4,8 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 inherit cross
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 

diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index fef925edcc6668a216fe59639f855b23bcd9f3e7..8eca4dbd1fcf4ddbbd850ce82909e66494a333fc 100644 (file)
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -3,6 +3,5 @@ PR="r6"
 require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 require gcc3-build-cross.inc
 require gcc-package-cross.inc

diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index dbd23ffa9dfaef7711c35683152ed55b44bc9ba0..b2d4129c0fa63d2e92fae810f1302b083f890642 100644 (file)
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -3,6 +3,5 @@ PR = "r13"
 require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 require gcc3-build-cross.inc
 require gcc-package-cross.inc

diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index 2982f0f73e45a1eedf2a51d4111b312297dc3d0f..b21c5e8a7be20fbeb0b958d58459bb9d3c0ab0db 100644 (file)
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -3,6 +3,5 @@ PR = "r8"
 require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 require gcc3-build-cross.inc
 require gcc-package-cross.inc

diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index 2bec608de7a0ba7e2530324fed49d02f135c6c8a..2f8c99cbdcf270f4367cf9a437ae1047bfa950a8 100644 (file)
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -4,8 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS += "gmp-native mpfr-native"
 
 require gcc3-build-cross.inc

diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 2152734199c8a66bafa6e3c109720f4359abfbf7..94dd182e9cfefe46300c4a95f449bae2f636d0f1 100644 (file)
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -4,8 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS += "gmp-native mpfr-native"
 
 require gcc3-build-cross.inc

diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index d22c4716276cbae085eb7d6d4863d47093fd73ef..4276c169f2c5115842599945abc009f01820fe61 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -4,8 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS += "gmp-native mpfr-native"
 
 require gcc3-build-cross.inc

diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index b108e503b8981afdd69260dd64acbedc42cad8f8..60985a6283cf3aa65b13208e48544b573c3ee085 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -4,8 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 DEPENDS += "gmp-native mpfr-native"
 
 require gcc3-build-cross.inc

diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index def27cf2dd14ac2d620673b69c71e5c4e52c3c0a..b46c39c979f1e7aae4025d1cc1427ac2ca03fdbd 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -3,7 +3,6 @@ PR = "r14"
 require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
 DEPENDS += "gmp-native mpfr-native"
 

diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 3dd14e125498d3ae6af45ba4858895723d4a54b0..140254e8ce4c7d2821b27e7b9a548e82c70d0a5a 100644 (file)
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -3,7 +3,6 @@ PR = "r13"
 require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
 DEPENDS += "gmp-native mpfr-native"
 

diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index b2b2bbd4d185a8db695a19e9a9b5b6878e54bf5c..e392e72ec946fee2c35d8d04af351a7e3b53a318 100644 (file)
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -4,7 +4,6 @@ require gcc-${PV}.inc
 require gcc-package-target.inc
 require gcc-cross.inc
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 DEPENDS += "gmp-native mpfr-native"
 
 require gcc3-build-cross.inc

diff --git a/packages/gcc/gcc-native.inc b/packages/gcc/gcc-native.inc
index 3cf20a45894a97b49591dc0db9e86c06221511de..6fa615ffc7108a251891f5a5b7e9a6318a1f9e32 100644 (file)
--- a/packages/gcc/gcc-native.inc
+++ b/packages/gcc/gcc-native.inc
@@ -4,8 +4,6 @@ PROVIDES = "gcc-native-${PV}"
 
 inherit native
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
 # This is intended to be a -very- basic config
 EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
                --with-newlib \