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