[PATCH 0/1] Bug #651 fixing

[PATCH 0/1] Bug #651 fixing

[Lianhao Lu]

Due to the gcc fixing in commit f13cb20, the c++ include dir is not needed to be
included in the CXXFLAGS environment variable in the meta-environment files.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: llu/bug651
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug651

Thanks,
    Lianhao Lu <lianhao.lu@intel.com>
---


Lianhao Lu (1):
  meta-environment: Remove c++ include dir from CXXFLAGS.

 meta/classes/toolchain-scripts.bbclass     |    2 +-
 meta/recipes-core/meta/meta-environment.bb |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

[PATCH 1/1] meta-environment: Remove c++ include dir from CXXFLAGS.

[Lianhao Lu]

[BUGID #651]. c++ include dir is no longer needed in the environment
files due to commit f13cb20.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 meta/classes/toolchain-scripts.bbclass     |    2 +-
 meta/recipes-core/meta/meta-environment.bb |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index a5b2bd1..5ec0e8a 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -84,7 +84,7 @@ toolchain_create_sdk_env_script_for_installer () {
 		ln -s /usr/local local
 	fi
 	echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
-	echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT## -I##SDKTARGETSYSROOT##${GXX_INCLUDEDIR}"' >> $script
+	echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
 	echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
 	echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
 	echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index da8d661..e5a6314 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Packge of environment files for SDK"
 LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 EXCLUDE_FROM_WORLD = "1"
 
@@ -16,8 +16,6 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}"
 
 inherit cross-canadian
 
-GXX_INCLUDEDIR := "${target_includedir}/c++"
-
 do_generate_content[nostamp] = "1"
 do_generate_content() {
 
-- 
1.7.0.4

Re: [PATCH 0/1] Bug #651 fixing

[Richard Purdie]

On Wed, 2011-01-12 at 10:11 +0800, Lianhao Lu wrote:
> Due to the gcc fixing in commit f13cb20, the c++ include dir is not needed to be
> included in the CXXFLAGS environment variable in the meta-environment files.
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: llu/bug651
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug651
> 
> Thanks,
>     Lianhao Lu <lianhao.lu@intel.com>


Merged into master, thanks.

Richard