[oe-commits] org.oe.dev packages/qt4/qtopia-core: Force building of tools, demos and examples

[freyther commit]

packages/qt4/qtopia-core: Force building of tools, demos and examples

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 334c3fe81497cd0c121f6445b9053dc3b6b40a2e
ViewMTN: http://monotone.openembedded.org/revision/info/334c3fe81497cd0c121f6445b9053dc3b6b40a2e
Files:
1
packages/qt4/qtopia-core/build-tools.patch
packages/qt4/qtopia-core.inc
Diffs:

#
# mt diff -rfc6211a28427a6d82895be30299c901ec3e85868 -r334c3fe81497cd0c121f6445b9053dc3b6b40a2e
#
# 
# 
# add_file "packages/qt4/qtopia-core/build-tools.patch"
#  content [6612f0ee0a17e0dbc12ea3bed6fa66232e887240]
# 
# patch "packages/qt4/qtopia-core.inc"
#  from [27e955f9b1f75f8581de52f9d083dd2df2ec13fa]
#    to [afdef9632312a739952146a0359c30d1fc64c12f]
# 
============================================================
--- packages/qt4/qtopia-core/build-tools.patch	6612f0ee0a17e0dbc12ea3bed6fa66232e887240
+++ packages/qt4/qtopia-core/build-tools.patch	6612f0ee0a17e0dbc12ea3bed6fa66232e887240
@@ -0,0 +1,28 @@
+Do not disable tools, examples and demos for the QWS build. Use brute-force
+to do this.
+
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure	2007-12-27 16:30:36.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/configure	2007-12-27 16:30:52.000000000 +0100
+@@ -2265,13 +2265,13 @@
+     CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS"
+ 
+     # don't build tools by default when cross-compiling
+-    if [ "$PLATFORM" != "$XPLATFORM" ]; then
+-	CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
+-    fi
+-fi
+-for nobuild in $CFG_NOBUILD_PARTS; do
+-    CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
+-done
++    #if [ "$PLATFORM" != "$XPLATFORM" ]; then
++    #	CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
++    #fi
++fi
++#for nobuild in $CFG_NOBUILD_PARTS; do
++#    CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
++#done
+ if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then
+ #    echo
+ #    echo "WARNING: libs is a required part of the build."
============================================================
--- packages/qt4/qtopia-core.inc	27e955f9b1f75f8581de52f9d083dd2df2ec13fa
+++ packages/qt4/qtopia-core.inc	afdef9632312a739952146a0359c30d1fc64c12f
@@ -10,7 +10,8 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/so
            file://0001-cross-compile.patch;patch=1 \
            file://0003-no-tools.patch;patch=1 \
            file://0004-no-qmake.patch;patch=1 \
-           file://0005-fix-mkspecs.patch;patch=1"
+           file://0005-fix-mkspecs.patch;patch=1 \
+           file://build-tools.patch;patch=1"
 S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"