-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathpatch_for_non_bnl_systems
264 lines (208 loc) · 7.1 KB
/
patch_for_non_bnl_systems
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
diff --git a/StRoot/RTS/include/fcfClass.hh b/StRoot/RTS/include/fcfClass.hh
index d69c819..9b5e509 100755
--- a/StRoot/RTS/include/fcfClass.hh
+++ b/StRoot/RTS/include/fcfClass.hh
@@ -13,7 +13,7 @@
// steering - watch it!
//#define FCF_ANNOTATE_CLUSTERS
-
+#define __unix
// flag definitions - NEVER CHANGE
#define FCF_ONEPAD 1
diff --git a/StRoot/RTS/src/rtsmakefile.def b/StRoot/RTS/src/rtsmakefile.def
index ecfd0c4..eb134ad 100755
--- a/StRoot/RTS/src/rtsmakefile.def
+++ b/StRoot/RTS/src/rtsmakefile.def
@@ -2,18 +2,18 @@
# works only with GNU make!
# where are we executing: SunOS or Linux (ONLY!)
-export HOST_SYSTEM := $(shell uname)
+HOST_SYSTEM := $(shell uname)
# useful for Linux
-export HOST_CPU := $(shell uname -m)
+HOST_CPU := $(shell uname -m)
# we want to treat daqman separately
-export HOST_NAME := $(shell uname -n)
+HOST_NAME := $(shell uname -n)
ifeq ($(HOST_NAME),daqman.starp.bnl.gov)
- export ENABLE_CROSS_COMPILER := 1
+ ENABLE_CROSS_COMPILER := 1
#else
-# export ENABLE_CROSS_COMPILER := 0
+# ENABLE_CROSS_COMPILER := 0
endif
@@ -21,12 +21,12 @@ endif
# go from "uname" to gcc -mcpu=TARGET_CPU variant
ifeq ($(HOST_CPU),ppc)
- export TARGET_CPU := 604
+ TARGET_CPU := 604
else
ifeq ($(HOST_CPU),alpha)
- export TARGET_CPU := 21264
+ TARGET_CPU := 21264
else
- export TARGET_CPU := $(HOST_CPU)
+ TARGET_CPU := $(HOST_CPU)
endif
endif
@@ -35,7 +35,7 @@ endif
# Set to STAR if not defined...
# Should be defined by USER in his environment variable
ifndef RTS_PROJECT
-export RTS_PROJECT := STAR
+RTS_PROJECT := STAR
endif
@@ -47,11 +47,11 @@ endif
# The currently supported target systems are: SUN, LINUX, MVME, I960, mv167
ifndef TARGET_SYSTEM
ifeq (${HOST_SYSTEM},SunOS)
- export TARGET_SYSTEM := SUN
+ TARGET_SYSTEM := SUN
else
ifeq (${HOST_SYSTEM},Linux)
- export TARGET_SYSTEM := LINUX
+ TARGET_SYSTEM := LINUX
endif
endif
endif
@@ -59,16 +59,16 @@ endif
ifeq ($(TARGET_SYSTEM),SUN)
- export TARGET_CPU := ultrasparc # MANUAL override
+ TARGET_CPU := ultrasparc # MANUAL override
endif
# set top level directory for bin, lib, conf etc.
ifndef PROJDIR
ifeq ($(RTS_PROJECT),STAR)
- export PROJDIR := /RTScache
+ PROJDIR := /RTScache
else
ifeq ($(RTS_PROJECT),PP2PP)
- export PROJDIR := /PP
+ PROJDIR := /PP
endif
endif
endif
@@ -76,17 +76,17 @@ endif
# if RTS_LOCAL defined in the environment
# we override a bunch of things...
ifdef RTS_LOCAL
-export RTS_DAQMAN := "127.0.0.1"
+RTS_DAQMAN := "127.0.0.1"
endif
ifndef RTS_DAQMAN
-export RTS_DAQMAN := "172.16.0.1"
+RTS_DAQMAN := "172.16.0.1"
endif
# if the RTS_DAQMAN exists in the environment we pass it on the
# compiler defines otherwise it stays empty
ifdef RTS_DAQMAN
-export RTS_DAQMAN_FLAGS := -DRTS_DAQMAN=\"${RTS_DAQMAN}\"
+RTS_DAQMAN_FLAGS := -DRTS_DAQMAN=\"${RTS_DAQMAN}\"
endif
@@ -107,7 +107,7 @@ endif
endif
ifndef RTS_DEV_PREFIX
-export RTS_DEV_PREFIX := pro_
+RTS_DEV_PREFIX := pro_
endif
@@ -144,8 +144,8 @@ INCLUDES = -I. -I.. -I$(RTS_DIR_PATH)/include -I$(RTS_DIR_PATH)/trg/include -I$
-export CC := gcc
-export CXX := g++
+CC := gcc
+CXX := g++
# by now we know the host system as well as the target
INSTALL_SUFFIX :=
@@ -199,20 +199,20 @@ endif
# cross-compiler overrides
ifeq (${TARGET_SYSTEM},MVME)
- export WIND_BASE:=/RTS/vxworks/wind_ppc
+ WIND_BASE:=/RTS/vxworks/wind_ppc
TOP_CROSS := ${WIND_BASE}/host/linux
- export CC := powerpc-wrs-vxworks-gcc
- export CXX := powerpc-wrs-vxworks-g++
- export LD := powerpc-wrs-vxworks-ld
- export NM := powerpc-wrs-vxworks-nm
+ CC := powerpc-wrs-vxworks-gcc
+ CXX := powerpc-wrs-vxworks-g++
+ LD := powerpc-wrs-vxworks-ld
+ NM := powerpc-wrs-vxworks-nm
TPATH :=${TOP_CROSS}/bin:${TOP_CROSS}/powerpc-wrs-vxworks/bin:
TPATH +=${PATH}
PATH :=${TPATH}
- export GCC_EXEC_PREFIX:=${TOP_CROSS}/lib/gcc-lib/
+ GCC_EXEC_PREFIX:=${TOP_CROSS}/lib/gcc-lib/
HOSTDEFINES = -D_GNU_TOOL -DMV2600 -DCPU=PPC604 -fno-exceptions -fno-rtti
@@ -239,20 +239,20 @@ ifeq (${TARGET_SYSTEM},MVME)
else
ifeq (${TARGET_SYSTEM},I960)
- export WIND_BASE:=/RTS/vxworks/wind_960
+ WIND_BASE:=/RTS/vxworks/wind_960
TOP_CROSS := ${WIND_BASE}/host/linux
- export CC := i960-wrs-vxworks5.3-gcc
- export CXX := i960-wrs-vxworks5.3-g++
- export LD := i960-wrs-vxworks5.3-ld
- export NM := i960-wrs-vxworks5.3-nm
+ CC := i960-wrs-vxworks5.3-gcc
+ CXX := i960-wrs-vxworks5.3-g++
+ LD := i960-wrs-vxworks5.3-ld
+ NM := i960-wrs-vxworks5.3-nm
TPATH :=${TOP_CROSS}/bin:${TOP_CROSS}/i960-wrs-vxworks5.3/bin:
TPATH +=${PATH}
PATH :=${TPATH}
- export GCC_EXEC_PREFIX:=${TOP_CROSS}/lib/gcc-lib/
+ GCC_EXEC_PREFIX:=${TOP_CROSS}/lib/gcc-lib/
HOSTDEFINES = -D_GNU_TOOL -DCPU=I960HX -DVX_IGNORE_GNU_LIBS -DRW_MULTI_THREAD
@@ -273,21 +273,21 @@ ifeq (${TARGET_SYSTEM},I960)
else
ifeq (${TARGET_SYSTEM},mv167)
- export WIND_BASE:=/RTS/vxworks/wind_68k/vxworks
+ WIND_BASE:=/RTS/vxworks/wind_68k/vxworks
TOP_CROSS := ${WIND_BASE}/host/x86-linux
- export CC := m68k-wrs-vxworks-gcc
- export CXX := m68k-wrs-vxworks-g++
- export LD := m68k-wrs-vxworks-ld
- export NM := m68k-wrs-vxworks-nm
+ CC := m68k-wrs-vxworks-gcc
+ CXX := m68k-wrs-vxworks-g++
+ LD := m68k-wrs-vxworks-ld
+ NM := m68k-wrs-vxworks-nm
TPATH :=${TOP_CROSS}/bin:${TOP_CROSS}/m68k-wrs-vxworks/bin:
TPATH +=${PATH}
PATH :=${TPATH}
- export GCC_EXEC_PREFIX:=${TOP_CROSS}/lib/gcc-lib/
+ GCC_EXEC_PREFIX:=${TOP_CROSS}/lib/gcc-lib/
# HOSTDEFINES = -D_GNU_TOOL -DCPU=MC68040 -DVX_IGNORE_GNU_LIBS -DRW_MULTI_THREAD
@@ -353,8 +353,8 @@ ifeq (${USE_64BITS}, 1)
HOSTDEFINES += -DUSE_64BITS=1
endif
-export LIBDIR = $(PROJDIR)/$(RTS_DEV_PREFIX)lib/${INSTALL_SUFFIX}
-export BINDIR = $(PROJDIR)/$(RTS_DEV_PREFIX)bin/${INSTALL_SUFFIX}
+LIBDIR = $(PROJDIR)/$(RTS_DEV_PREFIX)lib/${INSTALL_SUFFIX}
+BINDIR = $(PROJDIR)/$(RTS_DEV_PREFIX)bin/${INSTALL_SUFFIX}
# finelize standard variables...
INCLUDES += ${HOSTINCLUDES}
@@ -382,23 +382,23 @@ CFLAGS = ${BASEFLAGS} ${USRCFLAGS} ${DEFINES} ${INCLUDES}
# makes sense only for local system
ifeq ($(RTS_PROJECT),STAR)
- export LDLIBS = -L${LIBDIR} -lrtsComLib -lsunRT -lrtsCfgLib -lrtslog -lsfs ${HOSTLIBS}
+ LDLIBS = -L${LIBDIR} -lrtsComLib -lsunRT -lrtsCfgLib -lrtslog -lsfs ${HOSTLIBS}
else
ifeq ($(RTS_PROJECT),PP2PP)
- export LDLIBS = -L${LIBDIR} -lrtsComLib -lsunRT -lrtslog ${HOSTLIBS}
+ LDLIBS = -L${LIBDIR} -lrtsComLib -lsunRT -lrtslog ${HOSTLIBS}
endif
endif
-#export LDLIBS = ${LDLIBS} ${KOKKOS_LDFLAGS} ${KOKKOS_LIBS} -lpthread -ldl
+#LDLIBS = ${LDLIBS} ${KOKKOS_LDFLAGS} ${KOKKOS_LIBS} -lpthread -ldl
# noticed problems on Linux where the default linker gcc doesn't work well for g++ compiled
# files
LINK.o = $(CXX) $(LDFLAGS) $(TARGET_ARCH)
# misc. executables
-export MAKEDEPEND = makedepend -Y -w7 -- ${CXXFLAGS} -- *.cxx *.C *.h *.c *.hh 2>rts.makedepend.err
-export INSTALL:=/RTS/bin/install.sh
-export CLEAN := rm -f rts.makedepend.err err out *.o *.a *.so *.bak *~ #*
+MAKEDEPEND = makedepend -Y -w7 -- ${CXXFLAGS} -- *.cxx *.C *.h *.c *.hh 2>rts.makedepend.err
+INSTALL:=/RTS/bin/install.sh
+CLEAN := rm -f rts.makedepend.err err out *.o *.a *.so *.bak *~ #*
#added stuff so that we can compile .cxx
SUFFIXES += .cxx .hh