File: distutils-link.diff

package info (click to toggle)
python2.6 2.6.6-8%2Bdeb6u3
  • links: PTS, VCS
  • area: main
  • in suites: squeeze-lts
  • size: 65,368 kB
  • ctags: 106,965
  • sloc: ansic: 389,033; python: 375,783; asm: 9,734; sh: 4,934; makefile: 4,120; lisp: 2,933; objc: 775; xml: 62
file content (20 lines) | stat: -rw-r--r-- 1,231 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
# DP: Don't add standard library dirs to library_dirs and runtime_library_dirs.

Index: python2.6-2.6.5+20100521/Lib/distutils/unixccompiler.py
===================================================================
--- python2.6-2.6.5+20100521.orig/Lib/distutils/unixccompiler.py	2010-05-21 15:42:26.804710243 +0200
+++ python2.6-2.6.5+20100521/Lib/distutils/unixccompiler.py	2010-05-21 15:43:28.487711154 +0200
@@ -213,7 +213,12 @@
         objects, output_dir = self._fix_object_args(objects, output_dir)
         libraries, library_dirs, runtime_library_dirs = \
             self._fix_lib_args(libraries, library_dirs, runtime_library_dirs)
-
+        # filter out standard library paths, which are not explicitely needed
+        # for linking
+        library_dirs = [dir for dir in library_dirs
+                        if not dir in ('/lib', '/lib64', '/usr/lib', '/usr/lib64')]
+        runtime_library_dirs = [dir for dir in runtime_library_dirs
+                                if not dir in ('/lib', '/lib64', '/usr/lib', '/usr/lib64')]
         lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs,
                                    libraries)
         if type(output_dir) not in (StringType, NoneType):