remove arm-linux'isms from linux-oe-g++ and make it depending on the value of OE_TARGET_SYS

this enables to build Opie against OE staging area targetting e.g. uclibc, mips, or whatever

3 files changed, 14 insertions, 8 deletions

diff --git a/Vars.make b/Vars.make
index 1413282..6a52a93 100644
--- a/Vars.make
+++ b/Vars.make
@@ -12,21 +12,22 @@ ifneq ($(wildcard $(TOPDIR)/.config),)
 endif
 
 ifndef CONFIG_TARGET_OE
     ifndef QTDIR
     $(error QTDIR not set)
     endif
 else
     OEDIR:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g')
-    QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/arm-linux/qt2
+    OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g')
+    OETARGETSYS:=$(shell echo $(CONFIG_OE_TARGET_SYS) | sed -e's/"//g')
+    QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/$(OETARGETSYS)/qt2
     $(shell mkdir -p $(QTDIR)/src/moc)
     $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile)
     PLATFORM=sharp-linux
-    OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g')
 endif
 
 ifdef CONFIG_TARGET_X86
     PLATFORM=x86-linux
 endif
 ifdef CONFIG_TARGET_SHARP
   PLATFORM=sharp-linux
 endif
diff --git a/config.in b/config.in
index f913aad..e9ffed2 100644
--- a/config.in
+++ b/config.in
@@ -41,16 +41,21 @@ config OE_BUILD_DIR
   depends TARGET_OE
   string "OE build directory"
   default ">>>set OpenEmbedded build directory here<<<"
 
 config OE_HOST_SYS
   depends TARGET_OE
   string "OE host system"
   default "i686-linux"
+
+config OE_TARGET_SYS
+  depends TARGET_OE
+  string "OE target system"
+  default "arm-linux"
       
 config OPTIMIZE
   boolean "Use optimizations"
   default "y" if ! TARGET_X86
 
 config THREADED
   boolean "Enable threaded build"
   default "n"
diff --git a/mkspecs/qws/linux-oe-g++/qmake.conf b/mkspecs/qws/linux-oe-g++/qmake.conf
index 72bb489..bae5dbb 100644
--- a/mkspecs/qws/linux-oe-g++/qmake.conf
+++ b/mkspecs/qws/linux-oe-g++/qmake.conf
@@ -5,34 +5,34 @@
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
         CONFIG          += qt link_prl
 
 STAGING_BINDIR          = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin
 STAGING_CROSSDIR        = $(OEDIR)/tmp/cross/bin
-STAGING_INCDIR          = $(OEDIR)/tmp/staging/arm-linux/include $(OEDIR)/tmp/staging/arm-linux/include/freetype2/include
-STAGING_LIBDIR          = $(OEDIR)/tmp/staging/arm-linux/lib
+STAGING_INCDIR          = $(OEDIR)/tmp/staging/$(OETARGETSYS)/include $(OEDIR)/tmp/staging/$(OETARGETSYS)/include/freetype2/include
+STAGING_LIBDIR          = $(OEDIR)/tmp/staging/$(OETARGETSYS)/lib
 
-        QMAKE_CC        = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc
+        QMAKE_CC        = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-gcc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -Wall -W
         QMAKE_CFLAGS_WARN_OFF=
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= -fPIC
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
         QMAKE_CFLAGS_THREAD= -D_REENTRANT
 
-        QMAKE_CXX       = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM 
+        QMAKE_CXX       = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM 
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
         QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
         QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
         QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
@@ -43,18 +43,18 @@ QMAKE_INCDIR_X11	=
         QMAKE_LIBDIR_X11= 
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= 
         QMAKE_LIBDIR_OPENGL= 
         QMAKE_INCDIR_QTOPIA= 
         QMAKE_LIBDIR_QTOPIA= 
 
-        QMAKE_LINK      = $$STAGING_CROSSDIR/arm-linux-g++
-        QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/arm-linux-g++
+        QMAKE_LINK      = $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
+        QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
 QMAKE_LFLAGS_SHLIB      = -shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     =
 QMAKE_RPATH             = -Wl,-rpath-link,