Blame sip-4.12.4-no_rpath.patch
|
 |
3243244 |
diff -up sip-4.12.4/siputils.py.no_rpath sip-4.12.4/siputils.py
|
|
|
3243244 |
--- sip-4.12.4/siputils.py.no_rpath 2011-09-14 13:47:04.430121782 -0500
|
|
|
3243244 |
+++ sip-4.12.4/siputils.py 2011-09-14 13:49:58.173949684 -0500
|
|
|
3243244 |
@@ -418,11 +418,12 @@ class Makefile:
|
|
|
3243244 |
|
|
|
3243244 |
rpaths = _UniqueList()
|
|
|
3243244 |
|
|
|
3243244 |
- for l in self.extra_lib_dirs:
|
|
|
3243244 |
- # Ignore relative directories. This is really a hack to handle
|
|
|
3243244 |
- # SIP v3 inter-module linking.
|
|
|
3243244 |
- if os.path.dirname(l) not in ("", ".", ".."):
|
|
|
3243244 |
- rpaths.append(l)
|
|
|
3243244 |
+ ## HACK indeed, let's not rpath the world, mm-kay? -- rex
|
|
|
3243244 |
+ #for l in self.extra_lib_dirs:
|
|
|
3243244 |
+ ## Ignore relative directories. This is really a hack to handle
|
|
|
3243244 |
+ ## SIP v3 inter-module linking.
|
|
|
3243244 |
+ #if os.path.dirname(l) not in ("", ".", ".."):
|
|
|
3243244 |
+ #rpaths.append(l)
|
|
|
3243244 |
|
|
|
3243244 |
if self._python:
|
|
|
3243244 |
incdir.append(self.config.py_inc_dir)
|
|
|
3243244 |
@@ -591,7 +592,7 @@ class Makefile:
|
|
|
3243244 |
# Handle library directories.
|
|
|
3243244 |
libdir_qt = self.optional_list("LIBDIR_QT")
|
|
|
3243244 |
libdir.extend(libdir_qt)
|
|
|
3243244 |
- rpaths.extend(libdir_qt)
|
|
|
3243244 |
+ #rpaths.extend(libdir_qt)
|
|
|
3243244 |
|
|
|
3243244 |
if self.config.qt_version >= 0x040000:
|
|
|
3243244 |
# Try and read QT_LIBINFIX from qconfig.pri.
|