diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-12-12 08:43:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-12-12 08:43:07 +0000 |
| commit | cfd98f5000b28c9f2958600ba8cebf457ca8f67c (patch) | |
| tree | 1b2d6c0bd8c0ace62afaba41539d2713b2f9488e /meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch | |
| parent | 4db23a9e9061313d0c4c31c7f1b6915e9b1c0d35 (diff) | |
| download | poky-cfd98f5000b28c9f2958600ba8cebf457ca8f67c.tar.gz | |
qmake: Turn native package into a cross package since it touches target staging
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3333 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, 0 insertions, 22 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 deleted file mode 100644 index 4197dbbf64..0000000000 --- a/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 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; | ||