[oe-commits] Jeremy Lainé : qmake: drop obsolete patch 0008-backport-qt-lib-infix.patch
GIT User account
git at amethyst.openembedded.net
Wed Mar 4 11:08:15 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 3601c2a1dcbe56e5e5c46c418b0a0a23f2231f2e
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3601c2a1dcbe56e5e5c46c418b0a0a23f2231f2e
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date: Wed Mar 4 12:07:26 2009 +0100
qmake: drop obsolete patch 0008-backport-qt-lib-infix.patch
---
.../qmake/files/0008-backport-qt-lib-infix.patch | 33 --------------------
1 files changed, 0 insertions(+), 33 deletions(-)
diff --git a/packages/qmake/files/0008-backport-qt-lib-infix.patch b/packages/qmake/files/0008-backport-qt-lib-infix.patch
deleted file mode 100644
index f87576a..0000000
--- a/packages/qmake/files/0008-backport-qt-lib-infix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 32a7fd5..48d584f 100644
---- a/mkspecs/features/qt_functions.prf
-+++ b/mkspecs/features/qt_functions.prf
-@@ -28,7 +28,7 @@ defineTest(qtAddLibrary) {
- INCLUDEPATH -= $$FRAMEWORK_INCLUDE
- INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
- }
-- LINKAGE = -framework $${LIB_NAME}
-+ LINKAGE = -framework $${LIB_NAME}$${QT_LIBINFIX}
- } else:!qt_no_framework { #detection
- for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
- exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
-@@ -46,15 +46,15 @@ defineTest(qtAddLibrary) {
- }
- isEmpty(LINKAGE) {
- CONFIG(debug, debug|release) {
-- win32:LINKAGE = -l$${LIB_NAME}d
-- mac:LINKAGE = -l$${LIB_NAME}_debug
-+ win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
-+ mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
- }
-- isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}
-+ isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
- }
- !isEmpty(QMAKE_LSB) {
- QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT
- QMAKE_LFLAGS *= -L/opt/lsb/lib
-- QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}
-+ QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}${QT_LIBINFIX}
- }
- LIBS += $$LINKAGE
- export(LIBS)
More information about the Openembedded-commits
mailing list