gcc: Various fixups to ensure consistent gcc builds

(ported from oe-core for consistency)

We ensure that:
* the shared work directory contains PR and ensure PR values are consistent across gcc builds
* the regexp to handle library directories is in a specific task and run once

This avoids breakage that was seen in incremental builds after commit
be1f70d68b6b75772ebab8bdff683ddd7c42b0cd in oe-core where the interpretor could
become corrupted. This was due to the sed expression corrupting
the source directory.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

11 files changed, 1 insertions, 11 deletions

diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.5.inc b/meta-oe/recipes-devtools/gcc/gcc-4.5.inc
index e214a4dc6..662402c29 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-4.5.inc
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5.inc
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 
 
 PV = "4.5"
-INC_PR = "r39"
+PR = "r40"
 
 # BINV should be incremented after updating to a revision
 # after a minor gcc release (e.g. 4.5.1 or 4.5.2) has been made
diff --git a/meta-oe/recipes-devtools/gcc/gcc-cross-canadian_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-cross-canadian_4.5.bb
index 288bd3343..97e1a2bcb 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-cross-canadian_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-cross-canadian_4.5.bb
@@ -5,7 +5,6 @@ require recipes-devtools/gcc/gcc-cross-canadian.inc
 require recipes-devtools/gcc/gcc-configure-sdk.inc
 require recipes-devtools/gcc/gcc-package-sdk.inc
 
-PR = "${INC_PR}.0"
 
 DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
 RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
diff --git a/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb
index 3e67036bf..65ed3b4ba 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb
@@ -1,5 +1,4 @@
 require recipes-devtools/gcc/gcc-cross_${PV}.bb
 require recipes-devtools/gcc/gcc-cross-initial.inc
 
-PR = "${INC_PR}.0"
 
diff --git a/meta-oe/recipes-devtools/gcc/gcc-cross-intermediate_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-cross-intermediate_4.5.bb
index 8210483e7..889228838 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-cross-intermediate_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-cross-intermediate_4.5.bb
@@ -1,4 +1,3 @@
 require recipes-devtools/gcc/gcc-cross_${PV}.bb
 require recipes-devtools/gcc/gcc-cross-intermediate.inc
-PR = "${INC_PR}.0"
 
diff --git a/meta-oe/recipes-devtools/gcc/gcc-cross_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-cross_4.5.bb
index 0f810b71a..fde78981f 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-cross_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-cross_4.5.bb
@@ -1,4 +1,3 @@
-PR = "${INC_PR}.2"
 
 require recipes-devtools/gcc/gcc-${PV}.inc
 require recipes-devtools/gcc/gcc-cross4.inc
diff --git a/meta-oe/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.bb
index 7ebb27338..c0b662677 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.bb
@@ -1,4 +1,3 @@
 require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb
 require recipes-devtools/gcc/gcc-crosssdk-initial.inc
 
-PR = "${INC_PR}.0"
diff --git a/meta-oe/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.bb
index aa5b5a845..971f3ba0d 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.bb
@@ -1,4 +1,3 @@
 require recipes-devtools/gcc/gcc-cross-intermediate_${PV}.bb
 require recipes-devtools/gcc/gcc-crosssdk-intermediate.inc
 
-PR = "${INC_PR}.0"
diff --git a/meta-oe/recipes-devtools/gcc/gcc-crosssdk_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-crosssdk_4.5.bb
index b8e3aed66..40bdbf119 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-crosssdk_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-crosssdk_4.5.bb
@@ -1,4 +1,3 @@
 require recipes-devtools/gcc/gcc-cross_${PV}.bb
 require recipes-devtools/gcc/gcc-crosssdk.inc
 
-PR = "${INC_PR}.0"
diff --git a/meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb
index aaa48b529..a34ab40ff 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb
@@ -1,4 +1,3 @@
-PR = "${INC_PR}.1"
 
 require recipes-devtools/gcc/gcc-${PV}.inc
 require recipes-devtools/gcc/gcc-configure-runtime.inc
diff --git a/meta-oe/recipes-devtools/gcc/gcc_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc_4.5.bb
index 31fcac0a7..24fa751b8 100644
--- a/meta-oe/recipes-devtools/gcc/gcc_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc_4.5.bb
@@ -1,4 +1,3 @@
-PR = "${INC_PR}.1"
 
 require recipes-devtools/gcc/gcc-${PV}.inc
 require recipes-devtools/gcc/gcc-configure-target.inc
diff --git a/meta-oe/recipes-devtools/gcc/libgcc_4.5.bb b/meta-oe/recipes-devtools/gcc/libgcc_4.5.bb
index b97702f02..8a6c96a7a 100644
--- a/meta-oe/recipes-devtools/gcc/libgcc_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/libgcc_4.5.bb
@@ -1,6 +1,5 @@
 require recipes-devtools/gcc/gcc-${PV}.inc
 
-PR = "${INC_PR}.1"
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"