This is a follow up on commit: gcc-cross-sdk: Fix relocation of the toolchain and bump PR. sha1: f8bf7421bfe8eb86a3f17f269db4fb3667260c38
Signed-off-by: Andreas Fenkart <[email protected]> --- recipes/gcc/gcc-4.3.1.inc | 2 +- recipes/gcc/gcc-4.3.2.inc | 2 +- recipes/gcc/gcc-4.3.3.inc | 2 +- recipes/gcc/gcc-4.3.4.inc | 2 +- recipes/gcc/gcc-4.4.1.inc | 2 +- recipes/gcc/gcc-4.4.2.inc | 2 +- recipes/gcc/gcc-4.4.4.inc | 2 +- recipes/gcc/gcc-package-sdk.inc | 2 +- recipes/meta/meta-toolchain.bb | 2 -- 9 files changed, 8 insertions(+), 10 deletions(-) diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc index 3352868..c26f7aa 100644 --- a/recipes/gcc/gcc-4.3.1.inc +++ b/recipes/gcc/gcc-4.3.1.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r20" +INC_PR = "r21" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc index 897d4f3..2424abe 100644 --- a/recipes/gcc/gcc-4.3.2.inc +++ b/recipes/gcc/gcc-4.3.2.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r10" +INC_PR = "r11" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index 77cd521..f530a6b 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r12" +INC_PR = "r13" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.3.4.inc b/recipes/gcc/gcc-4.3.4.inc index 9711813..98823ff 100644 --- a/recipes/gcc/gcc-4.3.4.inc +++ b/recipes/gcc/gcc-4.3.4.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r8" +INC_PR = "r9" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc index 11b1535..0a83a04 100644 --- a/recipes/gcc/gcc-4.4.1.inc +++ b/recipes/gcc/gcc-4.4.1.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r8" +INC_PR = "r9" FILESPATHPKG .= ":gcc-$PV" diff --git a/recipes/gcc/gcc-4.4.2.inc b/recipes/gcc/gcc-4.4.2.inc index 8d14c99..eeb4740 100644 --- a/recipes/gcc/gcc-4.4.2.inc +++ b/recipes/gcc/gcc-4.4.2.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r2" +INC_PR = "r3" FILESPATHPKG .= ":gcc-$PV" diff --git a/recipes/gcc/gcc-4.4.4.inc b/recipes/gcc/gcc-4.4.4.inc index 4dd1bf6..21ae530 100644 --- a/recipes/gcc/gcc-4.4.4.inc +++ b/recipes/gcc/gcc-4.4.4.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r2" +INC_PR = "r3" FILESPATHPKG .= ":gcc-$PV" diff --git a/recipes/gcc/gcc-package-sdk.inc b/recipes/gcc/gcc-package-sdk.inc index dd32ec7..17ddcd5 100644 --- a/recipes/gcc/gcc-package-sdk.inc +++ b/recipes/gcc/gcc-package-sdk.inc @@ -20,7 +20,7 @@ FILES_${PN} = "\ ${includedir}/c++/${BINV} \ ${prefix}/${TARGET_SYS}/bin/* \ ${prefix}/${TARGET_SYS}/lib/* \ - ${prefix}/${TARGET_SYS}/usr/include/* \ + ${prefix}/${TARGET_SYS}/include/* \ " FILES_${PN}-doc = "\ ${infodir} \ diff --git a/recipes/meta/meta-toolchain.bb b/recipes/meta/meta-toolchain.bb index adc057a..e392a35 100644 --- a/recipes/meta/meta-toolchain.bb +++ b/recipes/meta/meta-toolchain.bb @@ -124,8 +124,6 @@ do_populate_sdk() { # With sysroot support, gcc expects the default C++ headers to be # in a specific place. install -d ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/include - mv ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/usr/include/c++ \ - ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/include/ # Fix or remove broken .la files for i in `find ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS} -name \*.la`; do -- 1.6.6.1 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
