mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
require recipes-devtools/gcc/gcc-cross_${PV}.bb
|
||||
require recipes-devtools/gcc/gcc-cross-initial.inc
|
||||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
require recipes-devtools/gcc/gcc-cross_${PV}.bb
|
||||
require recipes-devtools/gcc/gcc-cross-intermediate.inc
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
PR = "${INC_PR}.2"
|
||||
|
||||
require recipes-devtools/gcc/gcc-${PV}.inc
|
||||
require recipes-devtools/gcc/gcc-cross4.inc
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
require recipes-devtools/gcc/gcc-cross_${PV}.bb
|
||||
require recipes-devtools/gcc/gcc-crosssdk.inc
|
||||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
PR = "${INC_PR}.1"
|
||||
|
||||
require recipes-devtools/gcc/gcc-${PV}.inc
|
||||
require recipes-devtools/gcc/gcc-configure-runtime.inc
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
PR = "${INC_PR}.1"
|
||||
|
||||
require recipes-devtools/gcc/gcc-${PV}.inc
|
||||
require recipes-devtools/gcc/gcc-configure-target.inc
|
||||
|
||||
@@ -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++"
|
||||
|
||||
Reference in New Issue
Block a user