From: Kang Kai <kai.kang@windriver.com>
Date: Thu, 25 Aug 2011 02:55:40 +0000 (+0800)
Subject: cmake-nativesdk: remove gcc standard paths
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~44391
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bac15cc98e136892d4c09f2470622965bd9dbbeb;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

cmake-nativesdk: remove gcc standard paths

Because of the gcc-crosssdk bug, cmake-nativesdk needs to search gcc
standard paths itself. Right now it was fixed, so remove the additional
CXXFLAG for cmake-nativesdk.

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---

diff --git a/meta/recipes-devtools/cmake/cmake_2.8.5.bb b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
index 64e75746777..4fa9562a4b3 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.5.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
@@ -4,7 +4,7 @@ inherit cmake
 
 DEPENDS += "curl expat zlib libarchive ncurses"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI += "file://dont-run-cross-binaries.patch"
 
@@ -33,12 +33,6 @@ EXTRA_OECMAKE=" \
     ${@base_contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \
 "
 
-# FIXME: Hack due gcc-crosssdk not being able to detect those automatically
-CXXFLAGS_virtclass-nativesdk += " \
-   -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++ \
-   -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++/${TARGET_SYS} \
-   "
-
 FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}"
 FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"