From: | "Alex Alexander (wired)" <wired@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in dev-python/PyQt4/files: PyQt4-4.6.1-configure-multilib.patch |
Date: | Thu, 05 Nov 2009 07:59:38 |
Message-Id: | E1N5xFo-0004WE-74@stork.gentoo.org |
1 | wired 09/11/05 07:59:36 |
2 | |
3 | Added: PyQt4-4.6.1-configure-multilib.patch |
4 | Log: |
5 | added multilib patch wrt bug #283936 |
6 | (Portage version: 2.2_rc48/cvs/Linux x86_64) |
7 | |
8 | Revision Changes Path |
9 | 1.1 dev-python/PyQt4/files/PyQt4-4.6.1-configure-multilib.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/files/PyQt4-4.6.1-configure-multilib.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/files/PyQt4-4.6.1-configure-multilib.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: PyQt4-4.6.1-configure-multilib.patch |
15 | =================================================================== |
16 | --- PyQt-x11-gpl-4.6.1~orig/configure.py 2009-11-04 22:28:05.000000000 +0100 |
17 | +++ PyQt-x11-gpl-4.6.1/configure.py 2009-11-04 23:10:01.000000000 +0100 |
18 | @@ -854,8 +854,8 @@ |
19 | # version. |
20 | link = "-framework Python" |
21 | elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and |
22 | - glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))): |
23 | - lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"]) |
24 | + glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor))): |
25 | + lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"]) |
26 | link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor) |
27 | else: |
28 | sipconfig.inform("Qt Designer plugin disabled because Python library is static") |