use indirection for QMAKE_LINK, so we can differenciate between linking w/ CCLD and CXX

BKrev: 4103c4d6io9kO41mF9W0XNsFx8gBpg

diff --git a/classes/qmake-base.oeclass b/classes/qmake-base.oeclass
index e69de29..798ad5c 100644 (file)
--- a/classes/qmake-base.oeclass
+++ b/classes/qmake-base.oeclass
@@ -0,0 +1,40 @@
+DEPENDS_prepend = "qmake-native "
+
+OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++"
+QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
+
+# We override this completely to eliminate the -e normally passed in
+EXTRA_OEMAKE = ' MAKEFLAGS= '
+
+export OE_QMAKE_CC="${CC}"
+export OE_QMAKE_CFLAGS="${CFLAGS}"
+export OE_QMAKE_CXX="${CXX}"
+export OE_QMAKE_CXXFLAGS="${CXXFLAGS}"
+export OE_QMAKE_LDFLAGS="${LDFLAGS}"
+export OE_QMAKE_LINK="${CCLD}"
+export OE_QMAKE_AR="${AR}"
+export OE_QMAKE_STRIP="${STRIP}"
+export OE_QMAKE_UIC="${STAGING_BINDIR}/uic"
+export OE_QMAKE_MOC="${STAGING_BINDIR}/moc"
+export OE_QMAKE_RPATH="-Wl,-rpath-link,"
+
+# default to QTDIR
+export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
+
+oe_qmake_mkspecs () {
+    mkdir -p mkspecs/${OE_QMAKE_PLATFORM}
+    for f in ${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}/*; do
+        if [ -L $f ]; then
+            lnk=`readlink $f`
+            if [ -f mkspecs/${OE_QMAKE_PLATFORM}/$lnk ]; then
+                ln -s $lnk mkspecs/${OE_QMAKE_PLATFORM}/`basename $f`
+            else
+                cp $f mkspecs/${OE_QMAKE_PLATFORM}/
+            fi
+        else
+            cp $f mkspecs/${OE_QMAKE_PLATFORM}/
+        fi
+    done
+}
+

diff --git a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
index 4b05688..4af0a02 100644 (file)
--- a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
+++ b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
@@ -39,8 +39,8 @@ QMAKE_LIBDIR_QT               = $(OE_QMAKE_LIBDIR_QT)
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 
-QMAKE_LINK             = $(CCLD)
-QMAKE_LINK_SHLIB       = $(CCLD)
+QMAKE_LINK             = $(OE_QMAKE_LINK)
+QMAKE_LINK_SHLIB       = $(OE_QMAKE_LINK)
 QMAKE_LFLAGS           = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE   =
 QMAKE_LFLAGS_DEBUG     =