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