bug fix for 1231

PATCH Applied Kang Kai 2 participants 5 messages Aug 25, 2011 – Aug 30, 2011

lore

Share & tools

lore

Kang Kai

author

2011-08-25 05:48 UTC #0 lore raw

cover bug fix for 1231

From: Kang Kai <[email protected]>

Hi Saul,

qt4-tools-nativesdk needs set the gcc standard header searching paths because crosssdk.bbclass uses a undefined variable "includedir_nativesdk".

These commits are to fix it, and update qt4-tools-nativesdk and cmake-nativesdk bb files.

The following changes since commit 30381645eefe4e3222fd3ce45823f143ce2fa82c:

rt-tests: use an explicit commit ID (2011-08-12 21:07:02 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/distro
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro

Kang Kai (3):
bitbake.conf: set includedir_nativesdk
qt4-tools-nativesdk: remove gcc standard paths
cmake-nativesdk: remove gcc standard paths

 meta/conf/bitbake.conf                      |    1 +
 meta/recipes-devtools/cmake/cmake_2.8.5.bb  |    8 +-------
 meta/recipes-qt/qt4/qt4-tools-nativesdk.inc |    9 ++-------
 3 files changed, 4 insertions(+), 14 deletions(-)

Signature · 1 line

1.7.5.1.300.gc565c

Kang Kai

author

2011-08-25 05:48 UTC #1 lore raw

PATCH 1/3 bitbake.conf: set includedir_nativesdk

From: Kang Kai <[email protected]>

Fixes [Yocto #1231]

crosssdk.bbclass uses ${includedir_nativesdk} to define target_includedir, but includedir_nativesdk is not defined before. This makes gcc-crosssdk can NOT search the correct standard headers and libraries search path.

Define includedir_nativesdk in bitbake.conf.

Signed-off-by Kang Kai <[email protected]>

---
 meta/conf/bitbake.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

meta/conf/bitbake.conf +1 -0

index 7bb68b8..a22f5fa 100644
@@ -53,6 +53,7 @@ bindir_cross = "/bin"
 bindir_crossscripts = "${bindir}/crossscripts"
 prefix_nativesdk = "/usr"
 bindir_nativesdk = "${prefix_nativesdk}/bin"
+includedir_nativesdk = "${prefix_nativesdk}/include"
 libdir_nativesdk = "${prefix_nativesdk}/lib"
 base_libdir_nativesdk = "/lib"
 localstatedir_nativesdk = "/var"

Signature · 1 line

1.7.5.1.300.gc565c

Kang Kai

author

2011-08-25 05:48 UTC #2 lore raw

PATCH 2/3 qt4-tools-nativesdk: remove gcc standard paths

In reply to Kang Kai

From: Kang Kai <[email protected]>

gcc-crosssdk can't find the standard headers before, and it was fixed. So it is not needed to search the gcc standard paths by qt4-tools-nativesdk itself.

Signed-off-by Kang Kai <[email protected]>

---
 meta/recipes-qt/qt4/qt4-tools-nativesdk.inc |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

meta/recipes-qt/qt4/qt4-tools-nativesdk.inc +2 -7

index cc83b72..068528e 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 LICENSE = "LGPLv2.1 | GPLv3"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"

@@ -43,13 +43,8 @@ EXTRA_OECONF = "-prefix ${prefix} \
                 -arch ${@qt_arch(d)} \
                 -embedded -no-freetype -no-glib -no-iconv \
                 -qt3support \
-                -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include \
                 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \
-                -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib/dbus-1.0/include \
-                -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++ \
-                -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++/${TARGET_SYS} \
-                -L${STAGING_DIR_HOST}${SDKPATHNATIVE}/lib \
-                -L${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib"
+                -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib/dbus-1.0/include"
 
 # yank default -e, otherwise we get the following error:
 # moc_qbuffer.cpp: No such file or directory

Signature · 1 line

1.7.5.1.300.gc565c

Kang Kai

author

2011-08-25 05:49 UTC #3 lore raw

PATCH 3/3 cmake-nativesdk: remove gcc standard paths

In reply to Kang Kai

From: Kang Kai <[email protected]>

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

---
 meta/recipes-devtools/cmake/cmake_2.8.5.bb |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

meta/recipes-devtools/cmake/cmake_2.8.5.bb +1 -7

index 64e7574..4fa9562 100644
@@ -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}"

Signature · 1 line

1.7.5.1.300.gc565c

Richard Purdie

Applied

2011-08-30 21:25 UTC #4 lore raw

In reply to Kang Kai

Quoted 14 lines · Kang Kai

From: Kang Kai <[email protected]>
Hi Saul,
qt4-tools-nativesdk needs set the gcc standard header searching paths because crosssdk.bbclass uses a undefined variable "includedir_nativesdk".
These commits are to fix it, and update qt4-tools-nativesdk and cmake-nativesdk bb files.
The following changes since commit 30381645eefe4e3222fd3ce45823f143ce2fa82c:
rt-tests: use an explicit commit ID (2011-08-12 21:07:02 +0100)

Quoted 8 lines

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/distro
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro
Kang Kai (3):
bitbake.conf: set includedir_nativesdk
qt4-tools-nativesdk: remove gcc standard paths
cmake-nativesdk: remove gcc standard paths

Merged to master, thanks.

Richard