diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-10-05 19:37:00 +0400 |
---|---|---|
committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-10-05 19:37:00 +0400 |
commit | f109fd1be16cf97d1dea2b24e1334ed100d2a354 (patch) | |
tree | d0c29e91744bac39191c0460b27fe4d8e355c108 /recipes/qt4 | |
parent | 78069a1982eeb4fcd67920ecc3574f3659e913d0 (diff) | |
download | openembedded-f109fd1be16cf97d1dea2b24e1334ed100d2a354.tar.gz |
qt4-tools-sdk: correct my last commit: add a patch I've forgot
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'recipes/qt4')
-rw-r--r-- | recipes/qt4/files/compile.test-lflags.patch | 13 | ||||
-rw-r--r-- | recipes/qt4/qt4-tools-sdk.inc | 2 | ||||
-rw-r--r-- | recipes/qt4/qt4-tools-sdk_4.6.3.bb | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/recipes/qt4/files/compile.test-lflags.patch b/recipes/qt4/files/compile.test-lflags.patch new file mode 100644 index 0000000000..e4b256b0ce --- /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 09c9e9ca82..49f8df93ef 100644 --- 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 685f407c1a..152d06845c 100644 --- 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" |