← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to build_files/scons/config/Modules/FindPython.py

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
build_files/scons/config/Modules/FindPython.py
5
5
 
6
6
    python = "/usr"
7
7
    abi_flags = "m"  # Most common for linux distros
8
 
    version = "3.2"
 
8
    version = "3.3"
9
9
 
10
10
    # Determine ABI flags used on this system
11
11
    include = os.path.join(python, "include")
15
15
            abi_flags = cur_flags
16
16
            break
17
17
 
 
18
    # Find config.h. In some distros, such as ubuntu 12.10 they are not in standard include dir.
 
19
    incconf64 = os.path.join(include, "x86_64-linux-gnu", "python" + version + cur_flags, "pyconfig.h")
 
20
    if os.path.exists(incconf64):
 
21
        incconf = os.path.join(include, "x86_64-linux-gnu", "python" + version + cur_flags)
 
22
    else:
 
23
        incconf = ''
 
24
 
18
25
    # Determine whether python is in /usr/lib or /usr/lib64
19
26
    lib32 = os.path.join(python, "lib", "python" + version, "sysconfig.py")
20
27
    lib64 = os.path.join(python, "lib64", "python" + version, "sysconfig.py")
29
36
    return {'PYTHON': python,
30
37
            "VERSION": version,
31
38
            'LIBPATH': libpath,
32
 
            'ABI_FLAGS': abi_flags}
 
39
            'ABI_FLAGS': abi_flags,
 
40
            'CONFIG': incconf}