]>
Commit | Line | Data |
---|---|---|
6c73a6d2 JB |
1 | --- PyQt-x11-gpl-4.9.2/configure.py.orig 2012-06-23 22:27:26.000000000 +0200 |
2 | +++ PyQt-x11-gpl-4.9.2/configure.py 2012-06-23 22:31:20.495786424 +0200 | |
3 | @@ -965,6 +965,7 @@ | |
730d1fae BZ |
4 | else: |
5 | # Use distutils to get the additional configuration. | |
6 | from distutils.sysconfig import get_config_vars | |
6f5e558e | 7 | + from distutils.sysconfig import get_python_lib |
730d1fae BZ |
8 | ducfg = get_config_vars() |
9 | ||
6c73a6d2 | 10 | config_args = ducfg.get("CONFIG_ARGS", "") |
ac8c3304 | 11 | @@ -979,18 +980,7 @@ |
6c73a6d2 JB |
12 | dynamic_pylib = "--enable-shared" in config_args |
13 | ||
14 | if dynamic_pylib: | |
0ec58237 AM |
15 | - if glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)): |
16 | - lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"]) | |
ac8c3304 JR |
17 | - elif 'MULTIARCH' in ducfg and glob.glob('%s/lib/%s/libpython%d.%d*' % (ducfg['exec_prefix'], ducfg['MULTIARCH'], py_major, py_minor)): |
18 | - lib_dir_flag = quote('-L%s/lib/%s' % (ducfg['exec_prefix'], ducfg['MULTIARCH'])) | |
0ec58237 AM |
19 | - elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)): |
20 | - lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"]) | |
21 | - else: | |
22 | - sipconfig.inform("Qt Designer plugin disabled because Python library couldn't be found") | |
6c73a6d2 | 23 | - lib_dir_flag = '' |
0ec58237 AM |
24 | - opts.designer_plugin = False |
25 | - | |
6f5e558e | 26 | - link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi) |
6c73a6d2 | 27 | + link = "-L%s -lpython%d.%d%s" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor, abi) |
730d1fae BZ |
28 | else: |
29 | sipconfig.inform("Qt Designer plugin disabled because Python library is static") | |
71e04d77 | 30 | opts.designer_plugin = False |