diff options
Diffstat (limited to 'meta/recipes-qt/qt4/files')
-rw-r--r-- | meta/recipes-qt/qt4/files/compile.test-lflags.patch | 13 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/files/configure-lflags.patch | 13 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/files/configure-paths.patch | 21 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/files/qmake-exists-check.patch | 18 |
4 files changed, 65 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/files/compile.test-lflags.patch b/meta/recipes-qt/qt4/files/compile.test-lflags.patch new file mode 100644 index 0000000000..e4b256b0ce --- /dev/null +++ b/meta/recipes-qt/qt4/files/compile.test-lflags.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test | ||
2 | =================================================================== | ||
3 | --- qt-everywhere-opensource-src-4.6.3.orig/config.tests/unix/compile.test 2010-06-02 06:03:18.000000000 +0400 | ||
4 | +++ qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test 2010-10-04 17:35:07.587783460 +0400 | ||
5 | @@ -11,7 +11,7 @@ | ||
6 | EXE=`basename "$6"` | ||
7 | DESCRIPTION=$7 | ||
8 | shift 7 | ||
9 | -LFLAGS="" | ||
10 | +LFLAGS="$LDFLAGS" | ||
11 | INCLUDEPATH="" | ||
12 | CXXFLAGS="" | ||
13 | MAC_ARCH_CXXFLAGS="" | ||
diff --git a/meta/recipes-qt/qt4/files/configure-lflags.patch b/meta/recipes-qt/qt4/files/configure-lflags.patch new file mode 100644 index 0000000000..df195494ee --- /dev/null +++ b/meta/recipes-qt/qt4/files/configure-lflags.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: qtopia-core-opensource-src-4.3.3/configure | ||
2 | =================================================================== | ||
3 | --- qtopia-core-opensource-src-4.3.3.orig/configure 2008-01-14 08:53:51.000000000 +0000 | ||
4 | +++ qtopia-core-opensource-src-4.3.3/configure 2008-01-14 08:54:07.000000000 +0000 | ||
5 | @@ -447,7 +447,7 @@ | ||
6 | # initalize variables | ||
7 | #------------------------------------------------------------------------------- | ||
8 | |||
9 | -SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS" | ||
10 | +SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS" | ||
11 | for varname in $SYSTEM_VARIABLES; do | ||
12 | cmd=`echo \ | ||
13 | 'if [ -n "\$'${varname}'" ]; then | ||
diff --git a/meta/recipes-qt/qt4/files/configure-paths.patch b/meta/recipes-qt/qt4/files/configure-paths.patch new file mode 100644 index 0000000000..c9259a1159 --- /dev/null +++ b/meta/recipes-qt/qt4/files/configure-paths.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Index: qt-everywhere-opensource-src-4.6.3/configure | ||
2 | =================================================================== | ||
3 | --- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 15:47:37.100607001 +0000 | ||
4 | +++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 15:49:14.576606999 +0000 | ||
5 | @@ -7198,11 +7198,11 @@ | ||
6 | QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc | ||
7 | |||
8 | #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR | ||
9 | -QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc | ||
10 | -QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic | ||
11 | -QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 | ||
12 | -QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc | ||
13 | -QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp | ||
14 | +QMAKE_MOC = \${OE_QMAKE_MOC} | ||
15 | +QMAKE_UIC = \${OE_QMAKE_UIC} | ||
16 | +QMAKE_UIC3 = \${OE_QMAKE_UIC3} | ||
17 | +QMAKE_RCC = \${OE_QMAKE_RCC} | ||
18 | +QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP} | ||
19 | QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include | ||
20 | QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib | ||
21 | |||
diff --git a/meta/recipes-qt/qt4/files/qmake-exists-check.patch b/meta/recipes-qt/qt4/files/qmake-exists-check.patch new file mode 100644 index 0000000000..cc73837e53 --- /dev/null +++ b/meta/recipes-qt/qt4/files/qmake-exists-check.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | qt4-tools-nativesdk: avoid rebuilding qmake | ||
2 | |||
3 | qt4-tools-nativesdk patch to avoids building qmake in configure if it already exists | ||
4 | (as it will, since we symlink it in from the native sysroot in do_configure) | ||
5 | |||
6 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
7 | |||
8 | --- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 12:01:56.260607001 +0000 | ||
9 | +++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 12:02:20.584607015 +0000 | ||
10 | @@ -4286,7 +4286,7 @@ | ||
11 | } | ||
12 | |||
13 | # build qmake | ||
14 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
15 | +if [ '!' -f "$outpath/bin/qmake" ]; then | ||
16 | echo "Creating qmake. Please wait..." | ||
17 | |||
18 | OLD_QCONFIG_H= | ||