File: build_fix.patch

package info (click to toggle)
matplotlib 0.98.1-1%2Blenny4
  • links: PTS
  • area: main
  • in suites: lenny
  • size: 18,624 kB
  • ctags: 22,599
  • sloc: python: 76,915; cpp: 63,459; ansic: 5,353; makefile: 111; sh: 12
file content (56 lines) | stat: -rw-r--r-- 1,949 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
Index: matplotlib-0.98.1/setupext.py
===================================================================
--- matplotlib-0.98.1.orig/setupext.py	2008-10-08 23:11:20.000000000 +0000
+++ matplotlib-0.98.1/setupext.py	2008-10-08 23:15:16.000000000 +0000
@@ -47,8 +47,12 @@
 
 basedir = {
     'win32'  : ['win32_static',],
-    'linux2' : ['/usr/local', '/usr'],
-    'linux'  : ['/usr/local', '/usr',],
+    'linux2-alpha' : ['/usr'],
+    'linux2-hppa' : ['/usr'],
+    'linux2-mips' : ['/usr'],
+    'linux2-sparc' : ['/usr'],
+    'linux2' : ['/usr'],
+    'linux'  : ['/usr',],
     'cygwin' : ['/usr/local', '/usr',],
     'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
                 '/usr', '/sw', '/usr/X11R6'],
@@ -56,8 +60,8 @@
     'freebsd5' : ['/usr/local', '/usr'],
     'freebsd6' : ['/usr/local', '/usr'],
     'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
-    'gnukfreebsd5' : ['/usr/local', '/usr'],
-    'gnukfreebsd6' : ['/usr/local', '/usr'],
+    'gnukfreebsd5' : ['/usr'],
+    'gnukfreebsd6' : ['/usr'],
     'aix5' : ['/usr/local'],
 }
 
@@ -976,6 +980,10 @@
         tk_inc = os.path.normpath(os.path.join(tk_lib_dir,
                                                        '../../include'))
 
+    if not os.path.exists(tk_inc):
+        tk_inc = os.path.normpath(os.path.join(tk_lib_dir,
+                                               '../../../include/tcl' + tk_ver))
+
     if not os.path.exists(os.path.join(tk_inc, 'tk.h')):
         tk_inc = tcl_inc
 
@@ -993,10 +1001,10 @@
     return tcl_lib, tcl_inc, tk_lib, tk_inc
 
 def hardcoded_tcl_config():
-    tcl_inc = "/usr/local/include"
-    tk_inc = "/usr/local/include"
-    tcl_lib = "/usr/local/lib"
-    tk_lib = "/usr/local/lib"
+    tcl_inc = "/usr/include/tcl8.4"
+    tk_inc = "/usr/include/tcl8.4"
+    tcl_lib = "/usr/lib"
+    tk_lib = "/usr/lib"
     return tcl_lib, tcl_inc, tk_lib, tk_inc
 
 def add_tk_flags(module):