sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "scons: improve parsing CUSTOM_LDFLAGS" -- this change introduced env.ParseFlags which broke mason/travis integration

Browse source 
This reverts commit a25f53e667.

Revert "SCons.Util.CLVar:  fix __str__ method to flatten tuples + revert "add print to debug travis (temp)""

This reverts commit 2e78959435.

Revert "add print to debug travis (temp)"

This reverts commit 65dce899cb.

ref #4120
This commit is contained in:
Artem Pavlenko 2020-01-30 08:56:25 +00:00
parent 2e78959435
commit 26d3084ead
2 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
SConstruct
View file

@ -495,7 +495,6 @@ pickle_store = [# Scons internal variables
'LIBPATH', 'LIBPATH',
'LIBS', 'LIBS',
'LINKFLAGS', 'LINKFLAGS',
'RPATH',
'CUSTOM_LDFLAGS', # user submitted 'CUSTOM_LDFLAGS', # user submitted
'CUSTOM_DEFINES', # user submitted 'CUSTOM_DEFINES', # user submitted
'CUSTOM_CXXFLAGS', # user submitted 'CUSTOM_CXXFLAGS', # user submitted
@ -1421,23 +1420,7 @@ if not preconfigured:
env.Append(CXXFLAGS = env['CUSTOM_CXXFLAGS']) env.Append(CXXFLAGS = env['CUSTOM_CXXFLAGS'])
env.Append(CFLAGS = env['CUSTOM_CFLAGS']) env.Append(CFLAGS = env['CUSTOM_CFLAGS'])
env.Append(LINKFLAGS = DEFAULT_CXX14_LINKFLAGS) env.Append(LINKFLAGS = DEFAULT_CXX14_LINKFLAGS)
env.Append(LINKFLAGS = env['CUSTOM_LDFLAGS'])
custom_ldflags = env.ParseFlags(env['CUSTOM_LDFLAGS'])
# ParseFlags puts everything it does not recognize into CCFLAGS,
# but let's assume the user knows better, put those in LINKFLAGS
env.Append(LINKFLAGS = custom_ldflags.pop('CCFLAGS'))
env.Append(LINKFLAGS = custom_ldflags.pop('LINKFLAGS'),
LIBS = custom_ldflags.pop('LIBS'))
env.AppendUnique(FRAMEWORKS = custom_ldflags.pop('FRAMEWORKS'),
LIBPATH = custom_ldflags.pop('LIBPATH'),
RPATH = custom_ldflags.pop('RPATH'))
invalid_ldflags = {k:v for k,v in custom_ldflags.items() if v}
if invalid_ldflags:
color_print(3, 'Warning: CUSTOM_LDFLAGS contained some flags that SCons recognized as not for linker.')
color_print(3, 'The following flags will be ignored:')
for key, value in invalid_ldflags.items():
color_print(3, '\t%s = %r' % (key, value))
### platform specific bits ### platform specific bits

2
scons/scons-local-3.0.1/SCons/Util.py
View file

@ -1032,7 +1032,7 @@ class CLVar(UserList):
def __coerce__(self, other): def __coerce__(self, other):
return (self, CLVar(other)) return (self, CLVar(other))
def __str__(self): def __str__(self):
return ' '.join([' '.join(f) if type(f) is tuple else f for f in self.data]) return ' '.join(self.data)
# A dictionary that preserves the order in which items are added. # A dictionary that preserves the order in which items are added.
# Submitted by David Benjamin to ActiveState's Python Cookbook web site: # Submitted by David Benjamin to ActiveState's Python Cookbook web site: