summaryrefslogtreecommitdiff
authorar <ar>2004-10-17 10:40:42 (UTC)
committer ar <ar>2004-10-17 10:40:42 (UTC)
commit054918af08eb6041e3e5400c2024bc39e472fd8d (patch) (unidiff)
tree59018da78313bef031f14f09c46ce8784800884e
parent1deb4b9d09fcb0eddd8425de7d66e8919e1e0d32 (diff)
downloadopie-054918af08eb6041e3e5400c2024bc39e472fd8d.zip
opie-054918af08eb6041e3e5400c2024bc39e472fd8d.tar.gz
opie-054918af08eb6041e3e5400c2024bc39e472fd8d.tar.bz2
- only set CCACHE_PREFIX when distcc is installed.
remove buildrpoblems on machines without distcc (file not found on make)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make5
1 files changed, 3 insertions, 2 deletions
diff --git a/Vars.make b/Vars.make
index e76804d..1fd942a 100644
--- a/Vars.make
+++ b/Vars.make
@@ -77,50 +77,51 @@ ifeq ($(QTE_BASEVERSION),)
77 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 77 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
78 QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;') 78 QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;')
79 else 79 else
80 QTE_BASEVERSION=2.3.7 80 QTE_BASEVERSION=2.3.7
81 endif 81 endif
82endif 82endif
83export QTE_BASEVERSION 83export QTE_BASEVERSION
84 84
85ifeq ($(QTE_VERSION),) 85ifeq ($(QTE_VERSION),)
86 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 86 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
87 QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') 87 QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;')
88 else 88 else
89 QTE_VERSION=2.3.7 89 QTE_VERSION=2.3.7
90 endif 90 endif
91endif 91endif
92export QTE_VERSION 92export QTE_VERSION
93 93
94export PATH:=$(OPIEDIR)/scripts:$(PATH) 94export PATH:=$(OPIEDIR)/scripts:$(PATH)
95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
96 96
97ifdef CONFIG_OPTIMIZATIONS 97ifdef CONFIG_OPTIMIZATIONS
98export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 98export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
99export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 99export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
100endif 100endif
101 101
102ifeq ($(STRIP),) 102ifeq ($(STRIP),)
103 ifneq ($(CONFIG_TARGET_X86),) 103 ifneq ($(CONFIG_TARGET_X86),)
104 STRIP=strip 104 STRIP=strip
105 endif 105 endif
106 ifneq ($(CONFIG_TARGET_IPAQ),) 106 ifneq ($(CONFIG_TARGET_IPAQ),)
107 STRIP=arm-linux-strip 107 STRIP=arm-linux-strip
108 endif 108 endif
109 ifneq ($(CONFIG_TARGET_SHARP),) 109 ifneq ($(CONFIG_TARGET_SHARP),)
110 STRIP=arm-linux-strip 110 STRIP=arm-linux-strip
111 endif 111 endif
112 ifneq ($(CONFIG_TARGET_RAMSES),) 112 ifneq ($(CONFIG_TARGET_RAMSES),)
113 STRIP=arm-linux-strip 113 STRIP=arm-linux-strip
114 endif 114 endif
115 ifneq ($(CONFIG_TARGET_SIMPAD),) 115 ifneq ($(CONFIG_TARGET_SIMPAD),)
116 STRIP=arm-linux-strip 116 STRIP=arm-linux-strip
117 endif 117 endif
118 ifneq ($(CONFIG_TARGET_YOPY),) 118 ifneq ($(CONFIG_TARGET_YOPY),)
119 STRIP=arm-linux-strip 119 STRIP=arm-linux-strip
120 endif 120 endif
121endif 121endif
122 122
123export CCACHE=$(shell which ccache 2>/dev/null) 123export CCACHE=$(shell which ccache 2>/dev/null)
124export DISTCC=$(shell which distcc 2>/dev/null) 124export DISTCC=$(shell which distcc 2>/dev/null)
125export CCACHE_PREFIX=$(shell which distcc &>/dev/null && echo distcc) 125ifneq ($(DISTCC),)
126 126 export CCACHE_PREFIX=$(shell which distcc &>/dev/null && echo distcc)
127endif