You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
1.9 KiB
55 lines
1.9 KiB
diff --git a/openpgm/pgm/SConscript.autoconf b/openpgm/pgm/SConscript.autoconf
|
|
index d3d833d..abcfd94 100644
|
|
--- a/openpgm/pgm/SConscript.autoconf
|
|
+++ b/openpgm/pgm/SConscript.autoconf
|
|
@@ -113,7 +113,7 @@ def CheckMember (context, member, header):
|
|
int
|
|
main ()
|
|
{
|
|
- offsetof (""" + string.replace (member, '.', ', ') + """);
|
|
+ offsetof (""" + member.replace('.', ', ') + """);
|
|
return 0;
|
|
}
|
|
"""
|
|
diff --git a/openpgm/pgm/SConstruct b/openpgm/pgm/SConstruct
|
|
index adff0b7..d408945 100644
|
|
--- a/openpgm/pgm/SConstruct
|
|
+++ b/openpgm/pgm/SConstruct
|
|
@@ -116,7 +116,7 @@ release = env.Clone(BUILD = 'release')
|
|
release.Append(CCFLAGS = '-O2')
|
|
|
|
debug = env.Clone(BUILD = 'debug')
|
|
-debug.Append(CCFLAGS = ['-DPGM_DEBUG','-ggdb'], LINKFLAGS = '-gdb')
|
|
+debug.Append(CCFLAGS = ['-DPGM_DEBUG','-ggdb'], LINKFLAGS = '-ggdb')
|
|
|
|
profile = env.Clone(BUILD = 'profile')
|
|
profile.Append(CCFLAGS = ['-O2','-pg'], LINKFLAGS = '-pg')
|
|
@@ -206,15 +206,15 @@ if env['WITH_SNMP'] == 'true':
|
|
conf = Configure(env, custom_tests = tests);
|
|
|
|
if env['WITH_SNMP'] == 'true' and not conf.CheckSNMP():
|
|
- print 'Net-SNMP libraries not compatible.';
|
|
+ print ('Net-SNMP libraries not compatible.');
|
|
Exit(1);
|
|
|
|
if env['WITH_CHECK'] == 'true' and conf.CheckCheck():
|
|
- print 'Enabling Check unit tests.';
|
|
+ print ('Enabling Check unit tests.');
|
|
conf.env['CHECK'] = 'true';
|
|
env['CHECK_FLAGS'] = env.ParseFlags('!pkg-config --cflags --libs check');
|
|
else:
|
|
- print 'Disabling Check unit tests.';
|
|
+ print ('Disabling Check unit tests.');
|
|
conf.env['CHECK'] = 'false';
|
|
|
|
env = conf.Finish();
|
|
@@ -236,7 +236,7 @@ env.Append(BUILDERS = {'StaticSharedLibrary': pic_lib});
|
|
#-----------------------------------------------------------------------------
|
|
|
|
ref_node = 'ref/' + env['BUILD'] + '-' + platform.system() + '-' + platform.machine() + '/';
|
|
-BuildDir(ref_node, '.', duplicate=0)
|
|
+VariantDir(ref_node, '.', duplicate=0)
|
|
|
|
env.Append(CPPPATH = [
|
|
# $(top_builddir)/include
|