diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-11-01 20:41:23 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-01 20:41:23 +0100 |
| commit | 6221fac26cd348251fb26a7c0c4bdf5e2f0886bd (patch) | |
| tree | 8473f91c5f7e97325594bf21e22115e733fd02a9 | |
| parent | 47ee0b9f3407eacc0bd77f51ad88614fb53964a8 (diff) | |
| download | pytdeextensions-6221fac2.tar.gz pytdeextensions-6221fac2.zip | |
Fix libgcc library detection
Fix QT directories detection
Thanks to Francois Andriot
| -rwxr-xr-x | setup.py | 2 | ||||
| -rw-r--r-- | src/kdedistutils.py | 20 |
2 files changed, 20 insertions, 2 deletions
@@ -126,7 +126,7 @@ class BuildLibpythonize(Command): # Find the C library (libgcc, libgcc_s or some other variation). if self.clib is None: - canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name() ] + canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name(), "/usr/lib" ] self.clib = kdedistutils.FindFileInPaths("libgcc*.so",canidatepaths) if self.clib!=None: self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0] diff --git a/src/kdedistutils.py b/src/kdedistutils.py index 84b7517..64f274c 100644 --- a/src/kdedistutils.py +++ b/src/kdedistutils.py @@ -564,6 +564,9 @@ class BuildKControlModule(Command): # Qt inc dir if self.qt_inc_dir is None: canidatepaths = [] + qtinc = os.getenv("QTINC") + if qtinc != None: + canidatepaths.append(qtinc) qtdir = os.getenv("QTDIR") if qtdir != None: canidatepaths.append(os.path.join(qtdir,"include")) @@ -589,6 +592,9 @@ class BuildKControlModule(Command): # Qt lib dir if self.qt_lib_dir is None: canidatepaths = [] + qtlib = os.getenv("TQTLIB") + if qtlib != None: + canidatepaths.append(qtlib) qtdir = os.getenv("TQTDIR") if qtdir != None: canidatepaths.append(os.path.join(qtdir,get_libdir_name())) @@ -602,6 +608,9 @@ class BuildKControlModule(Command): self.qt_lib_dir = FindFileInPaths('libtqt*',canidatepaths) if self.qt_lib_dir is None: canidatepaths = [] + qtlib = os.getenv("QTLIB") + if qtlib != None: + canidatepaths.append(qtlib) qtdir = os.getenv("QTDIR") if qtdir != None: canidatepaths.append(os.path.join(qtdir,get_libdir_name())) @@ -651,7 +660,7 @@ class BuildKControlModule(Command): # Find the C library (libgcc, libgcc_s or some other variation). if self.clib is None: - canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name() ] + canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name(), "/usr/lib" ] self.clib = FindFileInPaths("libgcc*.so",canidatepaths) if self.clib!=None: self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0] @@ -1496,6 +1505,9 @@ class BuildKioslave(Command): # Qt inc dir if self.qt_inc_dir is None: canidatepaths = [] + qtinc = os.getenv("QTINC") + if qtinc != None: + canidatepaths.append(qtinc) qtdir = os.getenv("QTDIR") if qtdir != None: canidatepaths.append(os.path.join(qtdir,"include")) @@ -1519,6 +1531,9 @@ class BuildKioslave(Command): # Qt lib dir if self.qt_lib_dir is None: canidatepaths = [] + qtlib = os.getenv("TQTLIB") + if qtlib != None: + canidatepaths.append(qtlib) qtdir = os.getenv("TQTDIR") if qtdir != None: canidatepaths.append(os.path.join(qtdir,get_libdir_name())) @@ -1532,6 +1547,9 @@ class BuildKioslave(Command): self.qt_lib_dir = FindFileInPaths('libtqt*',canidatepaths) if self.qt_lib_dir is None: canidatepaths = [] + qtlib = os.getenv("QTLIB") + if qtlib != None: + canidatepaths.append(qtlib) qtdir = os.getenv("QTDIR") if qtdir != None: canidatepaths.append(os.path.join(qtdir,get_libdir_name())) |