> On 09/23/2011 06:43 AM, "Igor Maravić" wrote: >> When I did "scons install" rtrmngr was looking for .xrls files in folder >> /xrl/targets not in folder /xorp/xrls, so I changed that. >> Also I removed ; from if statements. >> Also only when value of 'optimize' is set to 'override', we should skip >> appending CFLAGS/CXXFLAGS. >> When it's value is 'no', CFLAGS/CXXFLAGS still have some value to be >> appended. > > Please break this into 3 different patches for these 3 different > things. > > For the .xrls part, what error did you see? I don't see > any trouble with 'scons install' on my systems. What command > are you using for the compile? > > Thanks, > Ben > > -- > Ben Greear <[email protected]> > Candela Technologies Inc http://www.candelatech.com > >
I removed ; from if statements. Signed-off-by: Igor Maravić <[email protected]> --- --- xorp/SConstruct.orig 2011-09-26 10:27:50.000000000 +0200 +++ xorp/SConstruct 2011-09-26 10:43:15.581919492 +0200 @@ -384,25 +384,25 @@ env['xorp_sourcedir'] = sourcedir # rt tst = ARGUMENTS.get('enable_boost', False) if tst and not (tst == "no"): - env['enable_boost'] = True; + env['enable_boost'] = True else: env['enable_boost'] = False tst = ARGUMENTS.get('enable_ustl', False) if tst and not (tst == "no"): - env['enable_ustl'] = True; + env['enable_ustl'] = True else: env['enable_ustl'] = False tst = ARGUMENTS.get('enable_tests', False) if tst and not (tst == "no"): - env['enable_tests'] = True; + env['enable_tests'] = True else: env['enable_tests'] = False tst = ARGUMENTS.get('enable_click', False) if tst and not (tst == "no"): - env['enable_click'] = True; + env['enable_click'] = True else: env['enable_click'] = False @@ -464,67 +464,67 @@ else: tst = ARGUMENTS.get('disable_ipv6', False) if tst and not (tst == "no"): - env['disable_ipv6'] = True; + env['disable_ipv6'] = True else: env['disable_ipv6'] = False tst = ARGUMENTS.get('disable_fw', False) if tst and not (tst == "no"): - env['disable_fw'] = True; + env['disable_fw'] = True else: env['disable_fw'] = False tst = ARGUMENTS.get('disable_libtecla', False) if tst and not (tst == "no"): - env['disable_libtecla'] = True; + env['disable_libtecla'] = True else: env['disable_libtecla'] = False tst = ARGUMENTS.get('disable_profile', False) if tst and not (tst == "no"): - env['disable_profile'] = True; + env['disable_profile'] = True else: env['disable_profile'] = False tst = ARGUMENTS.get('disable_warninglogs', False) if tst and not (tst == "no"): - env['disable_warninglogs'] = True; + env['disable_warninglogs'] = True else: env['disable_warninglogs'] = False tst = ARGUMENTS.get('disable_errorlogs', False) if tst and not (tst == "no"): - env['disable_errorlogs'] = True; + env['disable_errorlogs'] = True else: env['disable_errorlogs'] = False tst = ARGUMENTS.get('disable_tracelogs', False) if tst and not (tst == "no"): - env['disable_tracelogs'] = True; + env['disable_tracelogs'] = True else: env['disable_tracelogs'] = False tst = ARGUMENTS.get('disable_fatallogs', False) if tst and not (tst == "no"): - env['disable_fatallogs'] = True; + env['disable_fatallogs'] = True else: env['disable_fatallogs'] = False tst = ARGUMENTS.get('disable_infologs', False) if tst and not (tst == "no"): - env['disable_infologs'] = True; + env['disable_infologs'] = True else: env['disable_infologs'] = False tst = ARGUMENTS.get('disable_assertlogs', False) if tst and not (tst == "no"): - env['disable_assertlogs'] = True; + env['disable_assertlogs'] = True else: env['disable_assertlogs'] = False tst = ARGUMENTS.get('disable_otherlogs', False) if tst and not (tst == "no"): - env['disable_otherlogs'] = True; + env['disable_otherlogs'] = True else: env['disable_otherlogs'] = False @@ -574,7 +574,7 @@ if not env.GetOption('clean') and \ elif fnmatch.fnmatch(host_os, 'mingw32*'): osname = "Windows" conf.Define('HOST_OS_WINDOWS') - env['mingw'] = True; + env['mingw'] = True env['PROGSUFFIX'] = '.exe' elif fnmatch.fnmatch(host_os, 'linux*'): osname = "Linux" _______________________________________________ Xorp-hackers mailing list [email protected] http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-hackers
