diff options
Diffstat (limited to 'meta/recipes-devtools')
13 files changed, 45 insertions, 11 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1.inc b/meta/recipes-devtools/gcc/gcc-4.5.1.inc index 3edc4d43dc..1786d8a8e1 100644 --- a/meta/recipes-devtools/gcc/gcc-4.5.1.inc +++ b/meta/recipes-devtools/gcc/gcc-4.5.1.inc | |||
@@ -54,6 +54,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ | |||
54 | file://optional_libstdc.patch \ | 54 | file://optional_libstdc.patch \ |
55 | file://disable_relax_pic_calls_flag.patch \ | 55 | file://disable_relax_pic_calls_flag.patch \ |
56 | file://gcc-poison-parameters.patch \ | 56 | file://gcc-poison-parameters.patch \ |
57 | file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \ | ||
57 | " | 58 | " |
58 | 59 | ||
59 | SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " | 60 | SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " |
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch new file mode 100644 index 0000000000..9ae01c3fc7 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.5.1/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | # by default c++ include directories are not relative to "--sysroot" | ||
2 | # which brings one trouble when using the toolchain in an environment | ||
3 | # where the build directory generating that toolchain doesn't exist, | ||
4 | # e.g. in sstate, machine specific sysroot and relocatable SDK | ||
5 | # toolchain. This patch now enables c++ include paths under sysroot. | ||
6 | # This way it's enough as long as "--sysroot" is correctly enabled | ||
7 | # in the new environment. | ||
8 | # | ||
9 | # Signed-off-by Kevin Tian <kevin.tian@intel.com>, 2010-12-30 | ||
10 | |||
11 | diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c | ||
12 | index 5024f48..9b47d1c 100644 | ||
13 | --- a/gcc/cppdefault.c | ||
14 | +++ b/gcc/cppdefault.c | ||
15 | @@ -48,15 +48,15 @@ const struct default_include cpp_include_defaults[] | ||
16 | = { | ||
17 | #ifdef GPLUSPLUS_INCLUDE_DIR | ||
18 | /* Pick up GNU C++ generic include files. */ | ||
19 | - { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 0, 0 }, | ||
20 | + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 }, | ||
21 | #endif | ||
22 | #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR | ||
23 | /* Pick up GNU C++ target-dependent include files. */ | ||
24 | - { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 0, 1 }, | ||
25 | + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 1, 1 }, | ||
26 | #endif | ||
27 | #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR | ||
28 | /* Pick up GNU C++ backward and deprecated include files. */ | ||
29 | - { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0, 0 }, | ||
30 | + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 1, 0 }, | ||
31 | #endif | ||
32 | #ifdef LOCAL_INCLUDE_DIR | ||
33 | /* /usr/local/include comes before the fixincluded header files. */ | ||
diff --git a/meta/recipes-devtools/gcc/gcc-configure-cross.inc b/meta/recipes-devtools/gcc/gcc-configure-cross.inc index 3da92e24a1..04a8685358 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-cross.inc | |||
@@ -5,7 +5,7 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' | |||
5 | EXTRA_OECONF += " --enable-poison-system-directories " | 5 | EXTRA_OECONF += " --enable-poison-system-directories " |
6 | 6 | ||
7 | EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_exec_prefix} \ | 7 | EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_exec_prefix} \ |
8 | --with-gxx-include-dir=${STAGING_DIR_TARGET}/${target_includedir}/c++ \ | 8 | --with-gxx-include-dir=${target_includedir}/c++ \ |
9 | --with-sysroot=${STAGING_DIR_TARGET} \ | 9 | --with-sysroot=${STAGING_DIR_TARGET} \ |
10 | --with-build-sysroot=${STAGING_DIR_TARGET}" | 10 | --with-build-sysroot=${STAGING_DIR_TARGET}" |
11 | 11 | ||
diff --git a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc index 0eb33adda8..756e74e48d 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc | |||
@@ -5,7 +5,7 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' | |||
5 | USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' | 5 | USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' |
6 | 6 | ||
7 | EXTRA_OECONF_PATHS = "--with-local-prefix=${SDKPATH}/sysroots/${TARGET_SYS}${target_exec_prefix} \ | 7 | EXTRA_OECONF_PATHS = "--with-local-prefix=${SDKPATH}/sysroots/${TARGET_SYS}${target_exec_prefix} \ |
8 | --with-gxx-include-dir=${SDKPATH}/sysroots/${TARGET_SYS}${target_includedir}/c++ \ | 8 | --with-gxx-include-dir=${target_includedir}/c++ \ |
9 | --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \ | 9 | --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \ |
10 | --with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \ | 10 | --with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \ |
11 | --with-build-sysroot=${STAGING_DIR_TARGET}" | 11 | --with-build-sysroot=${STAGING_DIR_TARGET}" |
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb index 98e239d92c..37c64fb4ee 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb | |||
@@ -5,7 +5,7 @@ require gcc-cross-canadian.inc | |||
5 | require gcc-configure-sdk.inc | 5 | require gcc-configure-sdk.inc |
6 | require gcc-package-sdk.inc | 6 | require gcc-package-sdk.inc |
7 | 7 | ||
8 | PR = "r1" | 8 | PR = "r2" |
9 | 9 | ||
10 | DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" | 10 | DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" |
11 | RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" | 11 | RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" |
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb index e3aea8b356..a121782233 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require gcc-cross_${PV}.bb | 1 | require gcc-cross_${PV}.bb |
2 | require gcc-cross-initial.inc | 2 | require gcc-cross-initial.inc |
3 | 3 | ||
4 | PR = "r0" | 4 | PR = "r1" |
5 | 5 | ||
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb index 4cabe0eb4b..7aaa5b0512 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require gcc-cross_${PV}.bb | 1 | require gcc-cross_${PV}.bb |
2 | require gcc-cross-intermediate.inc | 2 | require gcc-cross-intermediate.inc |
3 | PR = "r0" | 3 | PR = "r1" |
4 | 4 | ||
diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb index 445869d1f5..b7e43285b2 100644 --- a/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | PR = "r0" | 1 | PR = "r1" |
2 | 2 | ||
3 | require gcc-${PV}.inc | 3 | require gcc-${PV}.inc |
4 | require gcc-cross4.inc | 4 | require gcc-cross4.inc |
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb index 22cb4904b7..0fc5faab3e 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require gcc-cross-initial_${PV}.bb | 1 | require gcc-cross-initial_${PV}.bb |
2 | require gcc-crosssdk-initial.inc | 2 | require gcc-crosssdk-initial.inc |
3 | 3 | ||
4 | PR = "r0" | 4 | PR = "r1" |
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb index ba42ca0e5c..4260c358ad 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require gcc-cross-intermediate_${PV}.bb | 1 | require gcc-cross-intermediate_${PV}.bb |
2 | require gcc-crosssdk-intermediate.inc | 2 | require gcc-crosssdk-intermediate.inc |
3 | 3 | ||
4 | PR = "r0" | 4 | PR = "r1" |
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb index 6f0a5406d0..a23a66258a 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require gcc-cross_${PV}.bb | 1 | require gcc-cross_${PV}.bb |
2 | require gcc-crosssdk.inc | 2 | require gcc-crosssdk.inc |
3 | 3 | ||
4 | PR = "r0" | 4 | PR = "r1" |
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb index 4d2302d35b..ca22e8be38 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | PR = "r0" | 1 | PR = "r1" |
2 | 2 | ||
3 | require gcc-${PV}.inc | 3 | require gcc-${PV}.inc |
4 | require gcc-configure-runtime.inc | 4 | require gcc-configure-runtime.inc |
diff --git a/meta/recipes-devtools/gcc/gcc_4.5.1.bb b/meta/recipes-devtools/gcc/gcc_4.5.1.bb index 81c1fa9c2d..a21772ff5d 100644 --- a/meta/recipes-devtools/gcc/gcc_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc_4.5.1.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | PR = "r0" | 1 | PR = "r1" |
2 | require gcc-${PV}.inc | 2 | require gcc-${PV}.inc |
3 | require gcc-configure-target.inc | 3 | require gcc-configure-target.inc |
4 | require gcc-package-target.inc | 4 | require gcc-package-target.inc |