diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-01-20 13:29:24 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2011-01-20 13:29:24 -0800 |
commit | b86b1570bd45deaf3e9b9b2249a989f001b3d4cc (patch) | |
tree | 5abda9ff6229fc824c554b47a90c90dea6e6cd48 /recipes/gcc | |
parent | 576df0d47658d195d7788ecaabdcb464a9b8f623 (diff) | |
download | openembedded-b86b1570bd45deaf3e9b9b2249a989f001b3d4cc.tar.gz |
gcc-cross,gcc-cross-sdk,gcc-cross-canadian-sdk: Disable nls when using uclibc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/gcc')
44 files changed, 44 insertions, 48 deletions
diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb index 08a4c950e1..aa4f0b51ce 100644 --- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb @@ -1,6 +1,6 @@ inherit canadian-sdk -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" diff --git a/recipes/gcc/gcc-configure-canadian-sdk.inc b/recipes/gcc/gcc-configure-canadian-sdk.inc index 5e27358d04..35d9163c1b 100644 --- a/recipes/gcc/gcc-configure-canadian-sdk.inc +++ b/recipes/gcc/gcc-configure-canadian-sdk.inc @@ -1,8 +1,6 @@ require gcc-configure-common.inc -USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibceabi", "no", "", d )}' - +USE_NLS_libc-uclibc = 'no' # # We need to override this and make sure the compiler can find staging # diff --git a/recipes/gcc/gcc-configure-cross.inc b/recipes/gcc/gcc-configure-cross.inc index 7041fcfafc..e1e1a26856 100644 --- a/recipes/gcc/gcc-configure-cross.inc +++ b/recipes/gcc/gcc-configure-cross.inc @@ -1,6 +1,6 @@ require gcc-configure-common.inc -USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' +USE_NLS_libc-uclibc = 'no' EXTRA_OECONF_PATHS = "--with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ diff --git a/recipes/gcc/gcc-configure-sdk.inc b/recipes/gcc/gcc-configure-sdk.inc index d4d61aa947..d38b94e419 100644 --- a/recipes/gcc/gcc-configure-sdk.inc +++ b/recipes/gcc/gcc-configure-sdk.inc @@ -1,8 +1,6 @@ require gcc-configure-common.inc -# The two lines below conflict, this needs fixing - RP -USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibceabi", "no", "", d )}' +USE_NLS_libc-uclibc = 'no' EXTRA_OECONF_PATHS = "--with-sysroot=${prefix}/${TARGET_SYS} \ --with-build-time-tools=${TOOLCHAIN_PATH}/${TARGET_SYS}/bin \ diff --git a/recipes/gcc/gcc-cross-sdk_3.3.4.bb b/recipes/gcc/gcc-cross-sdk_3.3.4.bb index b9fca30d68..2cc2b1ad57 100644 --- a/recipes/gcc/gcc-cross-sdk_3.3.4.bb +++ b/recipes/gcc/gcc-cross-sdk_3.3.4.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_3.4.3.bb b/recipes/gcc/gcc-cross-sdk_3.4.3.bb index b1ca74bd0b..74bfb51832 100644 --- a/recipes/gcc/gcc-cross-sdk_3.4.3.bb +++ b/recipes/gcc/gcc-cross-sdk_3.4.3.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_3.4.4.bb b/recipes/gcc/gcc-cross-sdk_3.4.4.bb index bb07bd36b6..be29879efa 100644 --- a/recipes/gcc/gcc-cross-sdk_3.4.4.bb +++ b/recipes/gcc/gcc-cross-sdk_3.4.4.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.0.bb b/recipes/gcc/gcc-cross-sdk_4.1.0.bb index 24c76b54dc..1b32390a10 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.0.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.0.bb @@ -1,5 +1,5 @@ -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.1.bb b/recipes/gcc/gcc-cross-sdk_4.1.1.bb index 7ea943e310..abfb39cbd7 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb b/recipes/gcc/gcc-cross-sdk_4.1.2.bb index b1525b3ba6..7eb0fa9645 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb b/recipes/gcc/gcc-cross-sdk_4.2.2.bb index 4ec237bbfb..43543c2e30 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb b/recipes/gcc/gcc-cross-sdk_4.2.3.bb index 62de382797..82bd95ea9f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb index 86ffc251ac..a35654e013 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb index 62de382797..82bd95ea9f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb index 62de382797..82bd95ea9f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb index 82bd95ea9f..9c4cdbee08 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.4.bb b/recipes/gcc/gcc-cross-sdk_4.3.4.bb index fbbfbcece3..62de382797 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.4.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.4.1.bb b/recipes/gcc/gcc-cross-sdk_4.4.1.bb index 9f8c75df07..f37467dce2 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.1.bb @@ -2,7 +2,7 @@ inherit sdk require gcc-${PV}.inc require gcc-cross-sdk.inc -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ diff --git a/recipes/gcc/gcc-cross-sdk_4.4.2.bb b/recipes/gcc/gcc-cross-sdk_4.4.2.bb index 9f8c75df07..f37467dce2 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.2.bb @@ -2,7 +2,7 @@ inherit sdk require gcc-${PV}.inc require gcc-cross-sdk.inc -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ diff --git a/recipes/gcc/gcc-cross-sdk_4.4.4.bb b/recipes/gcc/gcc-cross-sdk_4.4.4.bb index 439ae36ffb..aac3157084 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.4.bb @@ -2,7 +2,7 @@ inherit sdk require gcc-${PV}.inc require gcc-cross-sdk.inc -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ diff --git a/recipes/gcc/gcc-cross-sdk_4.5.bb b/recipes/gcc/gcc-cross-sdk_4.5.bb index d1e13d4d77..bb76ed531e 100644 --- a/recipes/gcc/gcc-cross-sdk_4.5.bb +++ b/recipes/gcc/gcc-cross-sdk_4.5.bb @@ -2,7 +2,7 @@ inherit sdk require gcc-${PV}.inc require gcc-cross-sdk.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} --with-system-zlib" diff --git a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb index 2e4fcf25a6..bcd80028bd 100644 --- a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_svn.bb b/recipes/gcc/gcc-cross-sdk_svn.bb index 847aada8d6..1afea778ca 100644 --- a/recipes/gcc/gcc-cross-sdk_svn.bb +++ b/recipes/gcc/gcc-cross-sdk_svn.bb @@ -4,7 +4,7 @@ require gcc-${PV}.inc require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DEPENDS += "libmpc-native gmp-native mpfr-native" diff --git a/recipes/gcc/gcc-cross_4.0.0.bb b/recipes/gcc/gcc-cross_4.0.0.bb index 2ab9ef4a5f..de6afbbdbc 100644 --- a/recipes/gcc/gcc-cross_4.0.0.bb +++ b/recipes/gcc/gcc-cross_4.0.0.bb @@ -1,4 +1,4 @@ -PR = "r9" +PR = "r10" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.0.2.bb b/recipes/gcc/gcc-cross_4.0.2.bb index 1294af5864..f78f6e0dbb 100644 --- a/recipes/gcc/gcc-cross_4.0.2.bb +++ b/recipes/gcc/gcc-cross_4.0.2.bb @@ -1,4 +1,4 @@ -PR = "r15" +PR = "r16" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.1.0.bb b/recipes/gcc/gcc-cross_4.1.0.bb index 39ad5fe327..d81cd2cc27 100644 --- a/recipes/gcc/gcc-cross_4.1.0.bb +++ b/recipes/gcc/gcc-cross_4.1.0.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.1.1.bb b/recipes/gcc/gcc-cross_4.1.1.bb index 1864078f71..bdce55d626 100644 --- a/recipes/gcc/gcc-cross_4.1.1.bb +++ b/recipes/gcc/gcc-cross_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.1.2.bb b/recipes/gcc/gcc-cross_4.1.2.bb index d2038c71b9..cdcbc46d33 100644 --- a/recipes/gcc/gcc-cross_4.1.2.bb +++ b/recipes/gcc/gcc-cross_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.2.1.bb b/recipes/gcc/gcc-cross_4.2.1.bb index 359a817d70..30c1d78912 100644 --- a/recipes/gcc/gcc-cross_4.2.1.bb +++ b/recipes/gcc/gcc-cross_4.2.1.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.2.2.bb b/recipes/gcc/gcc-cross_4.2.2.bb index 30c1d78912..617aa72b45 100644 --- a/recipes/gcc/gcc-cross_4.2.2.bb +++ b/recipes/gcc/gcc-cross_4.2.2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.2.3.bb b/recipes/gcc/gcc-cross_4.2.3.bb index 13dec2718e..440d8c06e3 100644 --- a/recipes/gcc/gcc-cross_4.2.3.bb +++ b/recipes/gcc/gcc-cross_4.2.3.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.2.4.bb b/recipes/gcc/gcc-cross_4.2.4.bb index 13dec2718e..440d8c06e3 100644 --- a/recipes/gcc/gcc-cross_4.2.4.bb +++ b/recipes/gcc/gcc-cross_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.3.1.bb b/recipes/gcc/gcc-cross_4.3.1.bb index 1c191faedb..68a265a058 100644 --- a/recipes/gcc/gcc-cross_4.3.1.bb +++ b/recipes/gcc/gcc-cross_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.3.2.bb b/recipes/gcc/gcc-cross_4.3.2.bb index 322a203bf4..e46a7e64a9 100644 --- a/recipes/gcc/gcc-cross_4.3.2.bb +++ b/recipes/gcc/gcc-cross_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.3.3.bb b/recipes/gcc/gcc-cross_4.3.3.bb index c8e2f9bc10..c476de62ad 100644 --- a/recipes/gcc/gcc-cross_4.3.3.bb +++ b/recipes/gcc/gcc-cross_4.3.3.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.3.4.bb b/recipes/gcc/gcc-cross_4.3.4.bb index 7edb21b3ff..c8e2f9bc10 100644 --- a/recipes/gcc/gcc-cross_4.3.4.bb +++ b/recipes/gcc/gcc-cross_4.3.4.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.4.1.bb b/recipes/gcc/gcc-cross_4.4.1.bb index fce459b494..49f3fd2fdb 100644 --- a/recipes/gcc/gcc-cross_4.4.1.bb +++ b/recipes/gcc/gcc-cross_4.4.1.bb @@ -1,6 +1,6 @@ require gcc-${PV}.inc require gcc-cross4.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch " diff --git a/recipes/gcc/gcc-cross_4.4.2.bb b/recipes/gcc/gcc-cross_4.4.2.bb index fce459b494..49f3fd2fdb 100644 --- a/recipes/gcc/gcc-cross_4.4.2.bb +++ b/recipes/gcc/gcc-cross_4.4.2.bb @@ -1,6 +1,6 @@ require gcc-${PV}.inc require gcc-cross4.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch " diff --git a/recipes/gcc/gcc-cross_4.4.4.bb b/recipes/gcc/gcc-cross_4.4.4.bb index 4309fd4baf..1ce10d0624 100644 --- a/recipes/gcc/gcc-cross_4.4.4.bb +++ b/recipes/gcc/gcc-cross_4.4.4.bb @@ -1,6 +1,6 @@ require gcc-${PV}.inc require gcc-cross4.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch " diff --git a/recipes/gcc/gcc-cross_4.5.bb b/recipes/gcc/gcc-cross_4.5.bb index 87fe194137..94862bd86f 100644 --- a/recipes/gcc/gcc-cross_4.5.bb +++ b/recipes/gcc/gcc-cross_4.5.bb @@ -1,7 +1,7 @@ require gcc-${PV}.inc require gcc-cross4.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" NATIVEDEPS += "libmpc-native libelf-native" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch " diff --git a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb index c155fc2995..32dffd9cff 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" require gcc-csl-arm-2007q3.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb index 11f6aff10b..2f1c2664b6 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-csl-arm-2008q1.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb index c3d1af8ad8..a58f82c202 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" require gcc-csl-arm-2008q3.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_svn.bb b/recipes/gcc/gcc-cross_svn.bb index 820829d42d..914e9725c6 100644 --- a/recipes/gcc/gcc-cross_svn.bb +++ b/recipes/gcc/gcc-cross_svn.bb @@ -1,6 +1,6 @@ require gcc-${PV}.inc require gcc-cross4.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DEPENDS += "libmpc-native" |