0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From 0ff75628845d3c86974c31b50ecd60c0b0144c6d Mon Sep 17 00:00:00 2001
  2. From: Titouan Christophe <titouan.christophe@railnova.eu>
  3. Date: Tue, 4 Feb 2020 13:44:27 +0100
  4. Subject: [PATCH] Fix mixed tabs/spaces in protolib wscript
  5. This fixes the following error when using waf in Python3:
  6. TabError: inconsistent use of tabs and spaces in indentation
  7. The upstream file has since diverged, but with similar issues.
  8. [Upstream status: https://github.com/USNavalResearchLaboratory/protolib/pull/6]
  9. Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
  10. ---
  11. protolib/wscript | 4 ++--
  12. 1 file changed, 2 insertions(+), 2 deletions(-)
  13. diff --git a/protolib/wscript b/protolib/wscript
  14. index 155a660..97dda93 100644
  15. --- a/protolib/wscript
  16. +++ b/protolib/wscript
  17. @@ -120,7 +120,7 @@ def configure(ctx):
  18. # Compiler-specific flags
  19. if ctx.options.debug:
  20. #ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG', '_DEBUG']
  21. - ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG']
  22. + ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG']
  23. else:
  24. ctx.env.DEFINES_BUILD_PROTOLIB += ['NDEBUG', "PROTO_DEBUG"]
  25. @@ -139,7 +139,7 @@ def configure(ctx):
  26. ctx.env.CFLAGS += ['/Od', '/RTC1', '/ZI']
  27. else:
  28. ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG']
  29. - #ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG', '/DWINVER=0x0501']
  30. + #ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG', '/DWINVER=0x0501']
  31. ctx.env.CFLAGS
  32. def build(ctx):
  33. --
  34. 2.24.1