| author | ar <ar> | 2005-01-12 17:25:17 (UTC) |
|---|---|---|
| committer | ar <ar> | 2005-01-12 17:25:17 (UTC) |
| commit | eaaafd114a8210b0d434231290ec5e294aae91bb (patch) (side-by-side diff) | |
| tree | 7f4c8c5895608c64a00241e947e076d35c7f51f0 | |
| parent | 5f267ae8b540c229201edb8d65fe40786ac8ec5d (diff) | |
| download | opie-eaaafd114a8210b0d434231290ec5e294aae91bb.zip opie-eaaafd114a8210b0d434231290ec5e294aae91bb.tar.gz opie-eaaafd114a8210b0d434231290ec5e294aae91bb.tar.bz2 | |
- make host system for oe based builds configurable
| -rw-r--r-- | Vars.make | 1 | ||||
| -rw-r--r-- | config.in | 5 | ||||
| -rw-r--r-- | mkspecs/qws/linux-oe-g++/qmake.conf | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -8,32 +8,33 @@ ifeq ($(IPK_DIR),) endif ifneq ($(wildcard $(TOPDIR)/.config),) include $(TOPDIR)/.config endif ifndef CONFIG_TARGET_OE ifndef QTDIR $(error QTDIR not set) endif else OEDIR:=$(CONFIG_OE_BUILD_DIR) QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 $(shell mkdir -p $(QTDIR)/src/moc) $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) PLATFORM=sharp-linux + OEHOSTSYS:=$(CONFIG_OE_HOST_SYS) endif ifdef CONFIG_TARGET_X86 PLATFORM=x86-linux endif ifdef CONFIG_TARGET_SHARP PLATFORM=sharp-linux endif ifdef CONFIG_TARGET_IPAQ PLATFORM=ipaq-linux endif ifdef CONFIG_TARGET_RAMSES PLATFORM=ramses-linux endif ifdef CONFIG_TARGET_SIMPAD PLATFORM=simpad-linux @@ -29,32 +29,37 @@ choice config TARGET_RAMSES boolean "Ramses" config TARGET_SIMPAD boolean "SIMpad" config TARGET_YOPY boolean "Yopy 3500/3700" endchoice 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 OPTIMIZE boolean "Use optimizations" default "y" if ! TARGET_X86 config THREADED boolean "Enable threaded build" default "n" config STATIC boolean "Build static libraries" default "n" config DEBUG boolean "Enable debug builds" default n diff --git a/mkspecs/qws/linux-oe-g++/qmake.conf b/mkspecs/qws/linux-oe-g++/qmake.conf index c4c273f..90166b0 100644 --- a/mkspecs/qws/linux-oe-g++/qmake.conf +++ b/mkspecs/qws/linux-oe-g++/qmake.conf @@ -1,27 +1,27 @@ # # $Id$ # # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler # MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += qt link_prl -STAGING_BINDIR = $(OEDIR)/tmp/staging/i686-linux/bin +STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-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 |