[PyQt4] drop extraneous import sys (doh)
Rex Dieter
rdieter at fedoraproject.org
Thu Dec 30 18:31:02 UTC 2010
commit 4bf33e6398396b8697b49d16ff26b22f4e7e8440
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Dec 30 12:32:01 2010 -0600
drop extraneous import sys (doh)
PyQt-x11-gpl-4.8.2-build_flags.patch | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/PyQt-x11-gpl-4.8.2-build_flags.patch b/PyQt-x11-gpl-4.8.2-build_flags.patch
index 9086fbb..f4aa55d 100644
--- a/PyQt-x11-gpl-4.8.2-build_flags.patch
+++ b/PyQt-x11-gpl-4.8.2-build_flags.patch
@@ -2,10 +2,10 @@
* append sys.abiflags to shlib name, if it exists
-diff -up PyQt-x11-gpl-4.8.2/configure.py.64bit PyQt-x11-gpl-4.8.2/configure.py
---- PyQt-x11-gpl-4.8.2/configure.py.64bit 2010-12-23 04:25:22.000000000 -0600
-+++ PyQt-x11-gpl-4.8.2/configure.py 2010-12-30 11:37:10.952221348 -0600
-@@ -925,16 +925,16 @@ include(%s)
+diff -up PyQt-x11-gpl-4.8.2/configure.py.build_flags PyQt-x11-gpl-4.8.2/configure.py
+--- PyQt-x11-gpl-4.8.2/configure.py.build_flags 2010-12-23 04:25:22.000000000 -0600
++++ PyQt-x11-gpl-4.8.2/configure.py 2010-12-30 12:27:32.871221845 -0600
+@@ -925,16 +925,15 @@ include(%s)
else:
# Use distutils to get the additional configuration.
from distutils.sysconfig import get_config_vars
@@ -21,7 +21,6 @@ diff -up PyQt-x11-gpl-4.8.2/configure.py.64bit PyQt-x11-gpl-4.8.2/configure.py
- lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
- link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor)
+ elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") ):
-+ import sys
+ link = "-L%s -lpython%s%s%s % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor, (sys.abiflags if hasattr(sys, 'abiflags') else ''))"
else:
sipconfig.inform("Qt Designer plugin disabled because Python library is static")
More information about the scm-commits
mailing list