From b348c6c18dec64402a558e8c050dcc8466f80de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 1 Nov 2012 20:41:23 +0100 Subject: [PATCH] Fix libgcc library detection Fix QT directories detection Thanks to Francois Andriot (cherry picked from commit 6221fac26cd348251fb26a7c0c4bdf5e2f0886bd) --- setup.py | 2 +- src/kdedistutils.py | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 930182e..20fe0d2 100755 --- a/setup.py +++ b/setup.py @@ -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 0e87451..70a298e 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")) @@ -585,6 +588,9 @@ class BuildKControlModule(Command): # Qt lib dir 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())) @@ -634,7 +640,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] @@ -1479,6 +1485,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")) @@ -1499,6 +1508,9 @@ class BuildKioslave(Command): # Qt lib dir 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()))