[oe-commits] org.oe.dev Qt: The suffix for the staging libdir was omitted, remove it from the libs

[freyther commit]

Qt: The suffix for the staging libdir was omitted, remove it from the libs

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 298cc962335508424eda99f8d166c1f5bf1f3cdd
ViewMTN: http://monotone.openembedded.org/revision/info/298cc962335508424eda99f8d166c1f5bf1f3cdd
Files:
1
classes/qmake2.bbclass
classes/qtopia4core.bbclass
Diffs:

#
# mt diff -r918294ca6f17f37cfb94dcba6fa2298b5152af56 -r298cc962335508424eda99f8d166c1f5bf1f3cdd
#
#
#
# patch "classes/qmake2.bbclass"
#  from [e469f74476f5cd684b559146bbd4e808de9dcadb]
#    to [8079b5564afd7c19bbc0088e21ca4e780a85b65f]
# 
# patch "classes/qtopia4core.bbclass"
#  from [b1d6e66685818c4024d7bfabaf21b47344f94360]
#    to [9e44d07549e666bc39b473d49004ee2a271a4f3e]
#
============================================================
--- classes/qmake2.bbclass	e469f74476f5cd684b559146bbd4e808de9dcadb
+++ classes/qmake2.bbclass	8079b5564afd7c19bbc0088e21ca4e780a85b65f
@@ -14,6 +14,6 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_I
 export OE_QMAKE_LINK = "${CXX}"
 export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
 export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
-export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
============================================================
--- classes/qtopia4core.bbclass	b1d6e66685818c4024d7bfabaf21b47344f94360
+++ classes/qtopia4core.bbclass	9e44d07549e666bc39b473d49004ee2a271a4f3e
@@ -5,7 +5,7 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_I
 # override variables set by qmake-base to compile QtopiaCore apps
 #
 export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia"
-export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopia"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = ""
 export OE_QMAKE_EXTRA_MODULES = "network"