Changeset 2942 for trunk


Ignore:
Timestamp:
05/13/14 14:51:25 (11 years ago)
Author:
Malte Marquarding
Message:

remove redundant libraries - lapack, blas and gfortran

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/SConstruct

    r2643 r2942  
    3333                ("extraroot", "Addition tree to look for packages", None),
    3434                ("extraflags", "Additional build flags", None),
    35                 ("FORTRAN", "The fortran compiler", None),
    36                 ("f2clib", "The fortran to c library", None),
    3735                PathVariable("casacoreroot", "The location of casacore",
    3836                             "/usr/local"),
     
    4543                ("boostlibdir", "The boost library location", None),
    4644                ("boostincdir", "The boost header file location", None),
    47                 ("lapackroot",
    48                  "The root directory where lapack is installed", None),
    49                 ("lapacklibdir", "The lapack library location", None),
    50                 ("lapacklib",
    51                  "The lapack library name (e.g. for specialized AMD libraries",
    52                  "lapack"),
    53                 ("blasroot",
    54                  "The root directory where blas is installed", None),
    55                 ("blaslibdir", "The blas library location", None),
    56                 ("blaslib",
    57                  "The blas library name (e.g. for specialized AMD libraries",
    58                  "blas"),
    5945                ("cfitsioroot",
    6046                 "The root directory where cfistio is installed", None),
     
    192178    conf.env.PrependUnique(LIBS=libs)
    193179
    194     # test for blas/lapack
    195     conf.env.AddCustomPackage("lapack")
    196     libname = conf.env.get("lapacklib", "lapack")
    197     if libname.find(".") > -1 and os.path.exists(libname):
    198         conf.env.AppendUnique(LIBS=[env.File(libname)])
    199     else:
    200         if not conf.CheckLib(libname): Exit(1)
    201     libname = conf.env.get("blaslib", "blas")
    202     if libname.find(".") > -1 and os.path.exists(libname):
    203         conf.env.AppendUnique(LIBS=[env.File(libname)])
    204     else:
    205         if not conf.CheckLib(libname): Exit(1)
    206 
    207     libname = conf.env.get("f2clib", "gfortran")
    208     if libname.find(".") > -1 and os.path.exists(libname):
    209         conf.env.AppendUnique(LIBS=[env.File(libname)])
    210     else:
    211         conf.env.CheckFortran(conf)
    212180    if not conf.CheckLib('stdc++', language='c++'): Exit(1)
    213181    if conf.env["alma"]:
     
    220188opts.Save('options.cache', env)
    221189
    222 env["version"] = "4.1.x"
     190env["version"] = "4.3.x"
    223191
    224192if env['mode'] == 'release':
Note: See TracChangeset for help on using the changeset viewer.