pkgs/development/libraries/serf/scons.patch

   1 diff --git a/SConstruct b/SConstruct
   2 index 4358a23..6ce7776 100644
   3 --- a/SConstruct
   4 +++ b/SConstruct
   5 @@ -55,7 +55,7 @@ def RawListVariable(key, help, default):
   6  # To be used to ensure a PREFIX directory is only created when installing.
   7  def createPathIsDirCreateWithTarget(target):
   8    def my_validator(key, val, env):
   9 -    build_targets = (map(str, BUILD_TARGETS))
  10 +    build_targets = (list(map(str, BUILD_TARGETS)))
  11      if target in build_targets:
  12        return PathVariable.PathIsDirCreate(key, val, env)
  13      else:
  14 @@ -155,6 +155,7 @@ if sys.platform == 'win32':
  15  env = Environment(variables=opts,
  16                    tools=('default', 'textfile',),
  17                    CPPPATH=['.', ],
  18 +                  ENV=os.environ,
  19                    )
  20
  21  env.Append(BUILDERS = {
  22 @@ -163,9 +164,9 @@ env.Append(BUILDERS = {
  23                suffix='.def', src_suffix='.h')
  24    })
  25
  26 -match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
  27 -                  'SERF_MINOR_VERSION ([0-9]+).*'
  28 -                  'SERF_PATCH_VERSION ([0-9]+)',
  29 +match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
  30 +                  b'SERF_MINOR_VERSION ([0-9]+).*'
  31 +                  b'SERF_PATCH_VERSION ([0-9]+)',
  32                    env.File('serf.h').get_contents(),
  33                    re.DOTALL)
  34  MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
  35 @@ -183,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
  36
  37  unknown = opts.UnknownVariables()
  38  if unknown:
  39 -  print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
  40 +  print('Warning: Used unknown variables:', ', '.join(list(unknown.keys())))
  41
  42  apr = str(env['APR'])
  43  apu = str(env['APU'])