Changeset 1128 for trunk


Ignore:
Timestamp:
08/10/06 15:09:20 (18 years ago)
Author:
mar637
Message:

more fixes to 64bit install

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/SConstruct

    r1127 r1128  
    5959if  platform.architecture()[0] == '64bit':
    6060    env.Append(CPPFLAGS='-fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__x86_64__ -DAIPS_64B'.split())
     61    # hack to install into /usr/lib64 if scons isn't installed there
     62    if moduledir.startswith("/usr/lib/"):
     63        moduledir.replace("lib","lib64")
    6164if env['mode'] == 'release':
    6265    env.Append(LINKFLAGS=['-Wl,-O1'])
     
    6972asapmod = InstallTree(env,
    7073                      dest_dir = os.path.join(moduledir, "asap"),
    71                       src_dir  = env["dist_dir"],
     74                      src_dir  = "dist/asap",
    7275                      includes = ['*.py', '*.so'],
    7376                      excludes = [])
  • trunk/scons/casa.py

    r1127 r1128  
     1__revision__ = "$Version:$"
    12import os
    23import sys
     
    45from SCons.Script import *
    56
    6 def addCasaLibs(env):
     7def addCasa(env):
    78    casalibs = "casav atnf images ms components coordinates \
    89                lattices fits measures measures_f \
     
    2526        conf.env.Append(CASAARCH = casa[1])
    2627        conf.env.Append(CASAROOT = casa[0])
    27         addCasaLibs(conf.env)
     28        addCasa(conf.env)
    2829        conf.Result('yes')
    2930        return True
    3031    casaarch = 'linux_gnu'
    3132    if sys.platform == 'darwin':
    32         casaarch = darwin
     33        casaarch = 'darwin'
    3334    elif sys.platform == 'linux2' and platform.architecture()[0] == '64bit':
    3435        casaarch = 'linux_64b'
     
    3738        paths = [path]
    3839    for p in paths:
    39         if os.path.isfile(os.path.join(p,casaarch,"lib/libcasa.a")):
     40        if os.path.isfile(os.path.join(p, casaarch, "lib/libcasa.a")):
    4041            conf.env.Append(CASAARCH = casaarch)
    4142            conf.env.Append(CASAROOT = os.path.abspath(p))
    42             addCasaLibs(conf.env)
     43            addCasa(conf.env)
    4344            conf.Result('yes')
    4445            return True
Note: See TracChangeset for help on using the changeset viewer.