source: trunk/dports/science/relax/files/relax.patch @ 92413

Last change on this file since 92413 was 92413, checked in by ryandesign@…, 5 years ago

relax: update to 1.3.15; use python27 instead of python26; enable tests; see #34238

File size: 2.2 KB
  • relax

    old new  
    1 #! /usr/bin/env python
     1#!@PREFIX@/bin/python2.7
    22
    33###############################################################################
    44#                                                                             #
  • sconstruct

    old new  
    9898    SYS = SYSTEM
    9999
    100100    # Mac OS X installation path.
    101     INSTALL_PATH = sys.prefix + sep + 'local'
     101    INSTALL_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'lib'
    102102
    103103
    104104# All other operating systems.
     
    118118RELAX_PATH = INSTALL_PATH + sep + 'relax'
    119119
    120120# Installation path for binaries.
    121 BIN_PATH = INSTALL_PATH + sep + 'bin'
     121BIN_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'bin'
    122122
    123123# Symbolic link installation path.
    124124SYMLINK = BIN_PATH + sep + 'relax'
    125125
    126126
    127 
    128127# The distribution files.
    129128#########################
    130129
     
    515514            cflags = '/nologo /I\"' + py_include_minpath + '\" /I\"' + numpy_path + '\"'
    516515        else:
    517516            cflags = '-I' + py_include_fullpath + ' -I' + numpy_path
    518         if env['PLATFORM'] == 'darwin':
    519             for arch in ['i386', 'ppc', 'x86_64']:
    520                 cflags += ' -arch %s' % arch
    521517
    522518        # Python library path.
    523519        libpath = ''
     
    537533                '-undefined', 'dynamic_lookup'
    538534            ]
    539535
    540             # Force all architectures.
    541             for arch in ['i386', 'ppc', 'x86_64']:
    542                 lnflags.append('-arch')
    543                 lnflags.append(arch)
    544 
    545536            # Set up the environment.
    546537            env.Append(LINKFLAGS = lnflags)
    547538            env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS')
  • scons/install.py

    old new  
    112112    ###############
    113113
    114114    # Run relax to create the *.pyc files.
    115     print("\nRunning relax to create the byte-compiled *.pyc files.")
    116     system(env['SYMLINK'] + " --test")
     115    # print("\nRunning relax to create the byte-compiled *.pyc files.")
     116    # system(env['SYMLINK'] + " --test")
    117117
    118118    # Final print out.
    119119    print("\n\n\n")
Note: See TracBrowser for help on using the repository browser.