summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-02-12 15:47:06 (UTC)
committer mickeyl <mickeyl>2005-02-12 15:47:06 (UTC)
commit0bf0f893a82426615cfe9f0bf764e1344c733ee3 (patch) (unidiff)
treeba147bb8ea70b409f15a76196097de49056576b6
parentf13760433a6526555bc5a4378ee3517f4053ac61 (diff)
downloadopie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.zip
opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.tar.gz
opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.tar.bz2
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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make5
-rw-r--r--config.in5
-rw-r--r--mkspecs/qws/linux-oe-g++/qmake.conf12
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),)
12endif 12endif
13 13
14ifndef CONFIG_TARGET_OE 14ifndef CONFIG_TARGET_OE
15 ifndef QTDIR 15 ifndef QTDIR
16 $(error QTDIR not set) 16 $(error QTDIR not set)
17 endif 17 endif
18else 18else
19 OEDIR:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g') 19 OEDIR:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g')
20 QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/arm-linux/qt2 20 OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g')
21 OETARGETSYS:=$(shell echo $(CONFIG_OE_TARGET_SYS) | sed -e's/"//g')
22 QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/$(OETARGETSYS)/qt2
21 $(shell mkdir -p $(QTDIR)/src/moc) 23 $(shell mkdir -p $(QTDIR)/src/moc)
22 $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) 24 $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile)
23 PLATFORM=sharp-linux 25 PLATFORM=sharp-linux
24 OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g')
25endif 26endif
26 27
27ifdef CONFIG_TARGET_X86 28ifdef CONFIG_TARGET_X86
28 PLATFORM=x86-linux 29 PLATFORM=x86-linux
29endif 30endif
30ifdef CONFIG_TARGET_SHARP 31ifdef CONFIG_TARGET_SHARP
31 PLATFORM=sharp-linux 32 PLATFORM=sharp-linux
32endif 33endif
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
41 depends TARGET_OE 41 depends TARGET_OE
42 string "OE build directory" 42 string "OE build directory"
43 default ">>>set OpenEmbedded build directory here<<<" 43 default ">>>set OpenEmbedded build directory here<<<"
44 44
45config OE_HOST_SYS 45config OE_HOST_SYS
46 depends TARGET_OE 46 depends TARGET_OE
47 string "OE host system" 47 string "OE host system"
48 default "i686-linux" 48 default "i686-linux"
49
50config OE_TARGET_SYS
51 depends TARGET_OE
52 string "OE target system"
53 default "arm-linux"
49 54
50config OPTIMIZE 55config OPTIMIZE
51 boolean "Use optimizations" 56 boolean "Use optimizations"
52 default "y" if ! TARGET_X86 57 default "y" if ! TARGET_X86
53 58
54config THREADED 59config THREADED
55 boolean "Enable threaded build" 60 boolean "Enable threaded build"
56 default "n" 61 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 @@
5# 5#
6 6
7 MAKEFILE_GENERATOR= UNIX 7 MAKEFILE_GENERATOR= UNIX
8 TEMPLATE = app 8 TEMPLATE = app
9 CONFIG += qt link_prl 9 CONFIG += qt link_prl
10 10
11STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin 11STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin
12STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin 12STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin
13STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include $(OEDIR)/tmp/staging/arm-linux/include/freetype2/include 13STAGING_INCDIR = $(OEDIR)/tmp/staging/$(OETARGETSYS)/include $(OEDIR)/tmp/staging/$(OETARGETSYS)/include/freetype2/include
14STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib 14STAGING_LIBDIR = $(OEDIR)/tmp/staging/$(OETARGETSYS)/lib
15 15
16 QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc 16 QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-gcc
17 QMAKE_LEX = flex 17 QMAKE_LEX = flex
18 QMAKE_LEXFLAGS = 18 QMAKE_LEXFLAGS =
19 QMAKE_YACC = yacc 19 QMAKE_YACC = yacc
20 QMAKE_YACCFLAGS = -d 20 QMAKE_YACCFLAGS = -d
21 QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) 21 QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)
22 QMAKE_CFLAGS_WARN_ON= -Wall -W 22 QMAKE_CFLAGS_WARN_ON= -Wall -W
23 QMAKE_CFLAGS_WARN_OFF= 23 QMAKE_CFLAGS_WARN_OFF=
24 QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) 24 QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
25 QMAKE_CFLAGS_DEBUG= -g 25 QMAKE_CFLAGS_DEBUG= -g
26 QMAKE_CFLAGS_SHLIB= -fPIC 26 QMAKE_CFLAGS_SHLIB= -fPIC
27 QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses 27 QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
28 QMAKE_CFLAGS_THREAD= -D_REENTRANT 28 QMAKE_CFLAGS_THREAD= -D_REENTRANT
29 29
30 QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM 30 QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM
31 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) 31 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
32 QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON 32 QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
33 QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF 33 QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
34 QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE 34 QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
35 QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG 35 QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
36 QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB 36 QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
37 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC 37 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
38 QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD 38 QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
@@ -43,18 +43,18 @@ QMAKE_INCDIR_X11 =
43 QMAKE_LIBDIR_X11= 43 QMAKE_LIBDIR_X11=
44 QMAKE_INCDIR_QT = $(QTDIR)/include 44 QMAKE_INCDIR_QT = $(QTDIR)/include
45 QMAKE_LIBDIR_QT = $(QTDIR)/lib 45 QMAKE_LIBDIR_QT = $(QTDIR)/lib
46 QMAKE_INCDIR_OPENGL= 46 QMAKE_INCDIR_OPENGL=
47 QMAKE_LIBDIR_OPENGL= 47 QMAKE_LIBDIR_OPENGL=
48 QMAKE_INCDIR_QTOPIA= 48 QMAKE_INCDIR_QTOPIA=
49 QMAKE_LIBDIR_QTOPIA= 49 QMAKE_LIBDIR_QTOPIA=
50 50
51 QMAKE_LINK = $$STAGING_CROSSDIR/arm-linux-g++ 51 QMAKE_LINK = $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
52 QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/arm-linux-g++ 52 QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
53 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 53 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
54 QMAKE_LFLAGS_RELEASE= 54 QMAKE_LFLAGS_RELEASE=
55 QMAKE_LFLAGS_DEBUG= 55 QMAKE_LFLAGS_DEBUG=
56QMAKE_LFLAGS_SHLIB = -shared 56QMAKE_LFLAGS_SHLIB = -shared
57QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB 57QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
58QMAKE_LFLAGS_SONAME = -Wl,-soname, 58QMAKE_LFLAGS_SONAME = -Wl,-soname,
59QMAKE_LFLAGS_THREAD = 59QMAKE_LFLAGS_THREAD =
60QMAKE_RPATH = -Wl,-rpath-link, 60QMAKE_RPATH = -Wl,-rpath-link,