aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/qt4
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-09-29 16:22:36 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-09-30 16:02:30 +0800
commit5703890dbe8f3c38af41872f5caf105c1280f9f4 (patch)
treee7219157220831019b3ee759874af02731c9107b /recipes/qt4
parentf454442543a01a735a933a53a7487e1690439288 (diff)
downloadopenembedded-5703890dbe8f3c38af41872f5caf105c1280f9f4.tar.gz
openembedded-5703890dbe8f3c38af41872f5caf105c1280f9f4.tar.bz2
openembedded-5703890dbe8f3c38af41872f5caf105c1280f9f4.zip
qt4-tools-native: Build the tools as -embedded to avoid X11 deps
We only need command line utilities and can avoid requiring X11.
Diffstat (limited to 'recipes/qt4')
-rw-r--r--recipes/qt4/qt4-tools-native-4.7.0/fix.xlib-test.libs.patch9
-rw-r--r--recipes/qt4/qt4-tools-native.inc5
-rw-r--r--recipes/qt4/qt4-tools-native_4.7.0.bb6
3 files changed, 4 insertions, 16 deletions
diff --git a/recipes/qt4/qt4-tools-native-4.7.0/fix.xlib-test.libs.patch b/recipes/qt4/qt4-tools-native-4.7.0/fix.xlib-test.libs.patch
deleted file mode 100644
index d7613033df..0000000000
--- a/recipes/qt4/qt4-tools-native-4.7.0/fix.xlib-test.libs.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: qt-everywhere-opensource-src-4.7.0-beta1/config.tests/x11/xlib/xlib.pro
-===================================================================
---- qt-everywhere-opensource-src-4.7.0-beta1.orig/config.tests/x11/xlib/xlib.pro
-+++ qt-everywhere-opensource-src-4.7.0-beta1/config.tests/x11/xlib/xlib.pro
-@@ -1,3 +1,4 @@
- CONFIG += x11
- CONFIG -= qt
- SOURCES = xlib.cpp
-+LIBS += -lXau -lXdmcp
diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
index b6e3107cf0..6915ba8c81 100644
--- a/recipes/qt4/qt4-tools-native.inc
+++ b/recipes/qt4/qt4-tools-native.inc
@@ -1,11 +1,11 @@
DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "zlib-native dbus-native libsm-native"
+DEPENDS = "zlib-native dbus-native"
SECTION = "libs"
HOMEPAGE = "http://www.trolltech.com"
PRIORITY = "optional"
LICENSE = "GPL"
-INC_PR = "r7"
+INC_PR = "r8"
inherit native
@@ -26,6 +26,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
-no-nas-sound \
-no-nis \
-verbose -release -static \
+ -embedded \
-qt3support"
# yank default -e, otherwise we get the following error:
diff --git a/recipes/qt4/qt4-tools-native_4.7.0.bb b/recipes/qt4/qt4-tools-native_4.7.0.bb
index b7fb8a6b3e..35c8cedffd 100644
--- a/recipes/qt4/qt4-tools-native_4.7.0.bb
+++ b/recipes/qt4/qt4-tools-native_4.7.0.bb
@@ -3,15 +3,11 @@ DEFAULT_PREFERENCE = "-1"
require qt4-tools-native.inc
LICENSE = "LGPLv2.1 GPLv3"
-DEPENDS += "libxau-native libxdmcp-native"
-
-
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
# Find the g++.conf/linux.conf in the right directory.
FILESPATHPKG =. "qt-${PV}:"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
- file://fix.xlib-test.libs.patch \
file://qt-config.patch \
file://g++.conf \
file://linux.conf"