qt4-tools-sdk: correct my last commit: add a patch I've forgot

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

diff --git a/recipes/qt4/files/compile.test-lflags.patch b/recipes/qt4/files/compile.test-lflags.patch
new file mode 100644 (file)
index 0000000..e4b256b
--- /dev/null
+++ b/recipes/qt4/files/compile.test-lflags.patch
@@ -0,0 +1,13 @@
+Index: qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test
+===================================================================
+--- qt-everywhere-opensource-src-4.6.3.orig/config.tests/unix/compile.test     2010-06-02 06:03:18.000000000 +0400
++++ qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test  2010-10-04 17:35:07.587783460 +0400
+@@ -11,7 +11,7 @@
+ EXE=`basename "$6"`
+ DESCRIPTION=$7
+ shift 7
+-LFLAGS=""
++LFLAGS="$LDFLAGS"
+ INCLUDEPATH=""
+ CXXFLAGS=""
+ MAC_ARCH_CXXFLAGS=""

diff --git a/recipes/qt4/qt4-tools-sdk.inc b/recipes/qt4/qt4-tools-sdk.inc
index 09c9e9c..49f8df9 100644 (file)
--- a/recipes/qt4/qt4-tools-sdk.inc
+++ b/recipes/qt4/qt4-tools-sdk.inc
@@ -12,7 +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://compile.test-lflags.patch \
            file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"

diff --git a/recipes/qt4/qt4-tools-sdk_4.6.3.bb b/recipes/qt4/qt4-tools-sdk_4.6.3.bb
index 685f407..152d068 100644 (file)
--- a/recipes/qt4/qt4-tools-sdk_4.6.3.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.6.3.bb
@@ -12,7 +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://compile.test-lflags.patch \
            file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"