diff options
| author |   Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-10-05 17:40:47 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-10-05 17:40:47 +0400 |
| commit | 78069a1982eeb4fcd67920ecc3574f3659e913d0 (patch) | |
| tree | 0d3ca2bce0ccc2c3fe73bcf874c16e6c6dfa5b85 | |
| parent | d523823c539552c075ba39e0c884781d2970231d (diff) | |
| download | openembedded-78069a1982eeb4fcd67920ecc3574f3659e913d0.tar.gz | |
qt4-tools-sdk: fix building when no native freetype/X11 are installed
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| -rw-r--r-- | recipes/qt4/qt4-tools-sdk.inc | 2 | ||||
| -rw-r--r-- | 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 88aa6587e2..09c9e9ca82 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 6eceadaff6..685f407c1a 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" |