[oe-commits] Dmitry Eremin-Solenikov : qt4-tools-sdk: fix building when no native freetype/X11 are installed

[git version control]

Module: openembedded.git
Branch: master
Commit: 78069a1982eeb4fcd67920ecc3574f3659e913d0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=78069a1982eeb4fcd67920ecc3574f3659e913d0

Author: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Date:   Tue Oct  5 17:40:47 2010 +0400

qt4-tools-sdk: fix building when no native freetype/X11 are installed

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>

---

 recipes/qt4/qt4-tools-sdk.inc      |    2 ++
 recipes/qt4/qt4-tools-sdk_4.6.3.bb |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/recipes/qt4/qt4-tools-sdk.inc b/recipes/qt4/qt4-tools-sdk.inc
index 88aa658..09c9e9c 100644
--- a/recipes/qt4/qt4-tools-sdk.inc
+++ b/recipes/qt4/qt4-tools-sdk.inc
@@ -12,6 +12,7 @@ inherit sdk
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
            file://configure-lflags.patch \
+           file://config.tests-rpath-link.patch \
            file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"
@@ -32,6 +33,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
                 -embedded -no-freetype -no-glib -no-iconv \
                 -qt3support \
                 -I${STAGING_DIR_NATIVE}/usr/include \
+                -I${STAGING_DIR_NATIVE}/usr/include/freetype2 \
                 -I${STAGING_DIR_NATIVE}/usr/include/dbus-1.0 \
                 -I${STAGING_DIR_NATIVE}/usr/lib/dbus-1.0/include"
 
diff --git a/recipes/qt4/qt4-tools-sdk_4.6.3.bb b/recipes/qt4/qt4-tools-sdk_4.6.3.bb
index 6eceada..685f407 100644
--- a/recipes/qt4/qt4-tools-sdk_4.6.3.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.6.3.bb
@@ -12,6 +12,7 @@ inherit sdk
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
            file://configure-lflags.patch \
+           file://config.tests-rpath-link.patch \
            file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"
@@ -31,6 +32,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
                 -verbose -release -fast -static \
                 -qt3support \
                 -I${STAGING_DIR_NATIVE}/usr/include \
+                -I${STAGING_DIR_NATIVE}/usr/include/freetype2 \
                 -I${STAGING_DIR_NATIVE}/usr/include/dbus-1.0 \
                 -I${STAGING_DIR_NATIVE}/usr/lib/dbus-1.0/include"