patch-SConstruct 1.4 KB

123456789101112131415161718192021222324
  1. $OpenBSD: patch-SConstruct,v 1.7 2016/09/04 16:46:57 landry Exp $
  2. 2nd chunk is needed for proper boost_thread detection
  3. --- SConstruct.orig Fri Feb 26 03:02:05 2016
  4. +++ SConstruct Sun Sep 4 17:29:08 2016
  5. @@ -290,7 +290,7 @@ opts.AddVariables(
  6. ('CUSTOM_LDFLAGS', 'Custom linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir>', ''),
  7. EnumVariable('LINKING', "Set library format for libmapnik",'shared', ['shared','static']),
  8. EnumVariable('RUNTIME_LINK', "Set preference for linking dependencies",'shared', ['shared','static']),
  9. - EnumVariable('OPTIMIZATION','Set compiler optimization level','3', ['0','1','2','3','4','s']),
  10. + EnumVariable('OPTIMIZATION','Set compiler optimization level','2', ['0','1','2','3','4','s']),
  11. # Note: setting DEBUG=True will override any custom OPTIMIZATION level
  12. BoolVariable('DEBUG', 'Compile a debug version of Mapnik', 'False'),
  13. BoolVariable('DEBUG_UNDEFINED', 'Compile a version of Mapnik using clang/llvm undefined behavior asserts', 'False'),
  14. @@ -1415,6 +1415,9 @@ if not preconfigured:
  15. # of attaching to cxxflags after configure
  16. if env['PLATFORM'] == 'SunOS':
  17. env.Append(CXXFLAGS = '-pthreads')
  18. + if env['PLATFORM'] == 'OpenBSD':
  19. + env.Append(CXXFLAGS = '-pthread')
  20. +
  21. # if requested, sort LIBPATH and CPPPATH before running CheckLibWithHeader tests
  22. if env['PRIORITIZE_LINKING']: