[oe-commits] org.oe.dev packages/qmake/qmake2-native: Move the LFLAGS to the end of the linker line

[freyther commit]

packages/qmake/qmake2-native: Move the LFLAGS to the end of the linker line

    Move the LFLAGS to the end of the linker line. Otherwise a package (e.g. webkit)
    will try to link to the library in the staging directory and not to the one
    recently built.
    Remove the unstage hack from webkit-gtk as it is not needed anymore.

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 2d557ebdb5406e5d0958992ae889acbc4822ae7c
ViewMTN: http://monotone.openembedded.org/revision/info/2d557ebdb5406e5d0958992ae889acbc4822ae7c
Files:
1
packages/qmake/qmake2-native-2.10a/use-lflags-last.patch
packages/qmake/qmake2-native_2.10a.bb
packages/webkit/webkit-gtk_svn.bb
Diffs:

#
# mt diff -rf961dac3a8dcb1aa95d8a11998dc42053b245afd -r2d557ebdb5406e5d0958992ae889acbc4822ae7c
#
# 
# 
# add_file "packages/qmake/qmake2-native-2.10a/use-lflags-last.patch"
#  content [2a3b02b5d73df2e28f5cc20363519b440f3921e0]
# 
# patch "packages/qmake/qmake2-native_2.10a.bb"
#  from [2ae898462a823c21fa451bd1c40a0350aaa745e3]
#    to [ee62f0cd510bf9374ee05aecd30c84f2f88ce94d]
# 
# patch "packages/webkit/webkit-gtk_svn.bb"
#  from [a5d1816993bda7f08a6373ea5b6a96c9f018f11a]
#    to [1bdedb776717ed3d1b2512c2e784c47970489c45]
# 
============================================================
--- packages/qmake/qmake2-native-2.10a/use-lflags-last.patch	2a3b02b5d73df2e28f5cc20363519b440f3921e0
+++ packages/qmake/qmake2-native-2.10a/use-lflags-last.patch	2a3b02b5d73df2e28f5cc20363519b440f3921e0
@@ -0,0 +1,22 @@
+Index: qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp
+===================================================================
+--- qtopia-core-opensource-src-4.3.1.orig/qmake/generators/unix/unixmake2.cpp	2007-10-07 13:45:26.000000000 +0200
++++ qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp	2007-10-07 13:57:09.000000000 +0200
+@@ -416,7 +416,7 @@
+                 t << "\n\t" << mkdir_p_asstring(destdir) << "\n\t";
+             if(!project->isEmpty("QMAKE_PRE_LINK"))
+                 t << var("QMAKE_PRE_LINK") << "\n\t";
+-            t << "$(LINK) $(LFLAGS) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS)";
++            t << "$(LINK) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS) $(LFLAGS)";
+             if(!project->isEmpty("QMAKE_POST_LINK"))
+                 t << "\n\t" << var("QMAKE_POST_LINK");
+             t << endl << endl;
+@@ -430,7 +430,7 @@
+                 t << mkdir_p_asstring(destdir) << "\n\t";
+             if(!project->isEmpty("QMAKE_PRE_LINK"))
+                 t << var("QMAKE_PRE_LINK") << "\n\t";
+-            t << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)";
++            t << "$(LINK) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LFLAGS)";
+             if(!project->isEmpty("QMAKE_POST_LINK"))
+                 t << "\n\t" << var("QMAKE_POST_LINK");
+             t << endl << endl;
============================================================
--- packages/qmake/qmake2-native_2.10a.bb	2ae898462a823c21fa451bd1c40a0350aaa745e3
+++ packages/qmake/qmake2-native_2.10a.bb	ee62f0cd510bf9374ee05aecd30c84f2f88ce94d
@@ -9,6 +9,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
            file://0001-fix-mkspecs.patch;patch=1 \
+           file://use-lflags-last.patch;patch=1 \
            file://linux-oe-qmake.conf"
 S = "${WORKDIR}/${QTVER}"
 
============================================================
--- packages/webkit/webkit-gtk_svn.bb	a5d1816993bda7f08a6373ea5b6a96c9f018f11a
+++ packages/webkit/webkit-gtk_svn.bb	1bdedb776717ed3d1b2512c2e784c47970489c45
@@ -60,13 +60,6 @@ do_stage() {
 }
 
 
-# Noooooooooooooooooooooooooooooooooooooooooooo...
-do_unstage() {
-        rm ${STAGING_LIBDIR}/libWebKitG* || true
-}
-
-addtask unstage before do_configure
-
 PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
 
 FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"