Skip to contentSkip to conversation

Bug #651 fixing

PATCH Applied Lianhao Lu 2 participants 3 messages Jan 12, 2011

lore
Share & tools
lore

Lianhao Lu

author
#0 lore raw

cover Bug #651 fixing

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 <[email protected]>
---

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(-)
author
#1 lore raw

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

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

Signed-off-by Lianhao Lu <[email protected]>
---
 meta/classes/toolchain-scripts.bbclass     |    2 +-
 meta/recipes-core/meta/meta-environment.bb |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
meta/classes/toolchain-scripts.bbclass +1 -1
index a5b2bd1..5ec0e8a 100644
@@ -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
meta/recipes-core/meta/meta-environment.bb +1 -3
index da8d661..e5a6314 100644
@@ -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() {
Signature · 1 line
1.7.0.4