comparison master.cfg @ 30:97e41899e7cb

remove trailing whitespace from master.cfg
author John W. Eaton <jwe@octave.org>
date Fri, 20 Aug 2021 15:25:30 -0400
parents 819a898b1960
children 08ec2af0065b
comparison
equal deleted inserted replaced
29:819a898b1960 30:97e41899e7cb
439 439
440 def mk_gcc_6_factory (nice, compile_opts, branch): 440 def mk_gcc_6_factory (nice, compile_opts, branch):
441 return mk_octave_factory (nice, 441 return mk_octave_factory (nice,
442 ["CC=gcc-6", "CXX=g++-6", "F77=gfortran-6"], 442 ["CC=gcc-6", "CXX=g++-6", "F77=gfortran-6"],
443 compile_opts, branch) 443 compile_opts, branch)
444 444
445 445
446 def mk_gcc_7_factory (nice, compile_opts, branch): 446 def mk_gcc_7_factory (nice, compile_opts, branch):
447 return mk_octave_factory (nice, 447 return mk_octave_factory (nice,
448 ["CC=gcc-7", "CXX=g++-7", "F77=gfortran-7"], 448 ["CC=gcc-7", "CXX=g++-7", "F77=gfortran-7"],
449 compile_opts, branch) 449 compile_opts, branch)
450 450
451 451
452 def mk_gcc_7_lto_factory (nice, compile_opts, branch): 452 def mk_gcc_7_lto_factory (nice, compile_opts, branch):
453 return mk_octave_factory (nice, 453 return mk_octave_factory (nice,
454 ["CC=gcc-7", "CXX=g++-7", "F77=gfortran-7", 454 ["CC=gcc-7", "CXX=g++-7", "F77=gfortran-7",
455 "CFLAGS=-O2 -flto=4 -ffat-lto-objects", 455 "CFLAGS=-O2 -flto=4 -ffat-lto-objects",
456 "CXXFLAGS=-O2 -flto=4 -ffat-lto-objects", 456 "CXXFLAGS=-O2 -flto=4 -ffat-lto-objects",
457 "FFLAGS=-O2 -flto=4 -ffat-lto-objects", 457 "FFLAGS=-O2 -flto=4 -ffat-lto-objects",
458 "LDFLAGS=-flto=4", 458 "LDFLAGS=-flto=4",
459 "NM=gcc-nm-7", "AR=gcc-ar-7", "RANLIB=gcc-ranlib-7"], 459 "NM=gcc-nm-7", "AR=gcc-ar-7", "RANLIB=gcc-ranlib-7"],
460 compile_opts, branch) 460 compile_opts, branch)
461 461
462 462
463 def mk_gcc_lto_factory (nice, compile_opts, branch): 463 def mk_gcc_lto_factory (nice, compile_opts, branch):
464 return mk_octave_factory (nice, 464 return mk_octave_factory (nice,
465 ["CFLAGS=-O2 -flto=4 -ffat-lto-objects", 465 ["CFLAGS=-O2 -flto=4 -ffat-lto-objects",
466 "CXXFLAGS=-O2 -flto=4 -ffat-lto-objects", 466 "CXXFLAGS=-O2 -flto=4 -ffat-lto-objects",
467 "FFLAGS=-O2 -flto=4 -ffat-lto-objects", 467 "FFLAGS=-O2 -flto=4 -ffat-lto-objects",
468 "LDFLAGS=-flto=4", 468 "LDFLAGS=-flto=4",
469 "NM=gcc-nm", "AR=gcc-ar", "RANLIB=gcc-ranlib"], 469 "NM=gcc-nm", "AR=gcc-ar", "RANLIB=gcc-ranlib"],
470 compile_opts, branch) 470 compile_opts, branch)
471 471
472 472
473 no_extras = ["--disable-docs", 473 no_extras = ["--disable-docs",
474 "--disable-fftw-threads", 474 "--disable-fftw-threads",
475 "--disable-java", 475 "--disable-java",
476 "--disable-jit", 476 "--disable-jit",
944 944
945 auth = util.UserPasswordAuth (octave_buildbot_config.master_id_and_pass) 945 auth = util.UserPasswordAuth (octave_buildbot_config.master_id_and_pass)
946 946
947 c['www']['auth'] = auth 947 c['www']['auth'] = auth
948 ## c['www']['authz'] = authz 948 ## c['www']['authz'] = authz
949 949
950 ## DB URL 950 ## DB URL
951 951
952 ## This specifies what database buildbot uses to store its state. You 952 ## This specifies what database buildbot uses to store its state. You
953 ## can leave this at its default for all but the largest installations. 953 ## can leave this at its default for all but the largest installations.
954 954