diff options
| author | Chris Lord <chris@openedhand.com> | 2007-12-06 10:23:27 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2007-12-06 10:23:27 +0000 |
| commit | 2517420cbef24dd1e9a903a8659d41d083a57e23 (patch) | |
| tree | d3a718c3a47ec0c746907395ca9c7bd072540ab3 /meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch | |
| parent | 8ccfa5c993a20c92ef7a2630ed37dea6d1159a89 (diff) | |
| download | poky-2517420cbef24dd1e9a903a8659d41d083a57e23.tar.gz | |
Import files from OE to build WebKit (patch to link icu required)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3317 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch')
| -rw-r--r-- | meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch b/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch new file mode 100644 index 0000000000..4197dbbf64 --- /dev/null +++ b/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | Index: qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp | ||
| 2 | =================================================================== | ||
| 3 | --- qtopia-core-opensource-src-4.3.1.orig/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:45:26.000000000 +0200 | ||
| 4 | +++ qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:57:09.000000000 +0200 | ||
| 5 | @@ -416,7 +416,7 @@ | ||
| 6 | t << "\n\t" << mkdir_p_asstring(destdir) << "\n\t"; | ||
| 7 | if(!project->isEmpty("QMAKE_PRE_LINK")) | ||
| 8 | t << var("QMAKE_PRE_LINK") << "\n\t"; | ||
| 9 | - t << "$(LINK) $(LFLAGS) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS)"; | ||
| 10 | + t << "$(LINK) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS) $(LFLAGS)"; | ||
| 11 | if(!project->isEmpty("QMAKE_POST_LINK")) | ||
| 12 | t << "\n\t" << var("QMAKE_POST_LINK"); | ||
| 13 | t << endl << endl; | ||
| 14 | @@ -430,7 +430,7 @@ | ||
| 15 | t << mkdir_p_asstring(destdir) << "\n\t"; | ||
| 16 | if(!project->isEmpty("QMAKE_PRE_LINK")) | ||
| 17 | t << var("QMAKE_PRE_LINK") << "\n\t"; | ||
| 18 | - t << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)"; | ||
| 19 | + t << "$(LINK) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LFLAGS)"; | ||
| 20 | if(!project->isEmpty("QMAKE_POST_LINK")) | ||
| 21 | t << "\n\t" << var("QMAKE_POST_LINK"); | ||
| 22 | t << endl << endl; | ||