From 0bf0f893a82426615cfe9f0bf764e1344c733ee3 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Sat, 12 Feb 2005 15:47:06 +0000 Subject: 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 --- diff --git a/Vars.make b/Vars.make index 1413282..6a52a93 100644 --- a/Vars.make +++ b/Vars.make @@ -17,11 +17,12 @@ ifndef CONFIG_TARGET_OE 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 diff --git a/config.in b/config.in index f913aad..e9ffed2 100644 --- a/config.in +++ b/config.in @@ -46,6 +46,11 @@ 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" 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 @@ -10,10 +10,10 @@ 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 @@ -27,7 +27,7 @@ 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 @@ -48,8 +48,8 @@ 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 = -- cgit v0.9.0.2