8 |
|
|
9 |
|
|
10 |
|
def read_plat(env, args, fn): |
11 |
< |
cfig = ConfigParser.ConfigParser(env.Dictionary()) |
11 |
> |
envdict = env.Dictionary().copy() |
12 |
> |
# can't feed ConfigParser the original dict, because it also |
13 |
> |
# contains non-string values. |
14 |
> |
for k,v in envdict.items(): |
15 |
> |
if not isinstance(v, str): |
16 |
> |
del envdict[k] |
17 |
> |
cfig = ConfigParser.ConfigParser(envdict) |
18 |
|
cfig.read(fn) |
19 |
< |
buildvars = [['CC'], # replace |
19 |
> |
buildvars = [['CC', |
20 |
> |
'TIFFINCLUDE', # where to find preinstalled tifflib headers |
21 |
> |
'TIFFLIB', # where to find a preinstalled tifflib library |
22 |
> |
], # replace |
23 |
|
['CPPPATH', 'CPPDEFINES', 'CPPFLAGS', 'CCFLAGS', |
24 |
|
'LIBPATH', 'LINKFLAGS', |
25 |
|
'EZXML_CPPDEFINES', # build flags specific to ezxml.c |
29 |
|
['RAD_BASEDIR', 'RAD_BINDIR', 'RAD_RLIBDIR', 'RAD_MANDIR'], |
30 |
|
[]], |
31 |
|
['code', |
32 |
< |
[], # replace |
32 |
> |
[ # replace |
33 |
> |
], |
34 |
|
[ # append |
35 |
|
'RAD_COMPAT', # theoretically obsolete (src/common/strcmp.c) |
36 |
|
'RAD_MATHCOMPAT', # erf.c floating point error function |