[Commits] (morgen) Patch to make sure we find our local copy of libdb

[commits at osafoundation.org]

Commit by: morgen
Modified files:
external/python/patches 1.2 1.3

Log message:
Patch to make sure we find our local copy of libdb


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/python/patches.diff?r1=text&tr1=1.2&r2=text&tr2=1.3

Index: external/python/patches
diff -u external/python/patches:1.2 external/python/patches:1.3
--- external/python/patches:1.2	Tue Mar 16 15:06:57 2004
+++ external/python/patches	Mon May 10 14:32:15 2004
@@ -1,19 +1,3 @@
---- Python-2.3.3/setup.py	Thu Mar 11 00:06:36 2004
-+++ Python-2.3.3-patched/setup.py	Wed Mar 10 23:57:45 2004
-@@ -516,6 +516,13 @@
-                                 )},
-             }
- 
-+        # for Chandler build
-+        if os.environ.has_key('DB'):
-+            DB = os.environ['DB']
-+            db_try_this['db4']['libdirs'] = ( os.path.join(DB, 'lib'), )
-+            db_try_this['db4']['incdirs'] = ( os.path.join(DB, 'include'), )
-+            del db_try_this['db3']
-+
-         db_search_order = db_try_this.keys()
-         db_search_order.sort()
-         db_search_order.reverse()
 --- Python-2.3.3/Mac/OSX/Makefile	Tue Nov  4 14:45:16 2003
 +++ Python-2.3.3-patched/Mac/OSX/Makefile	Thu Mar 11 00:55:56 2004
 @@ -58,8 +58,7 @@
@@ -67,3 +51,28 @@
          if os.environ.has_key('CC'):
              cc = os.environ['CC']
          if os.environ.has_key('CXX'):
+--- Python-2.3.3/setup.py	2003-10-21 13:01:21.000000000 -0700
++++ Python-2.3.3-patched/setup.py	2004-05-10 14:04:44.000000000 -0700
+@@ -516,6 +516,13 @@
+                                 )},
+             }
+ 
++        # for Chandler build
++        if os.environ.has_key('DB'):
++            DB = os.environ['DB']
++            db_try_this['db4']['libdirs'] = ( os.path.join(DB, 'lib'), )
++            db_try_this['db4']['incdirs'] = ( os.path.join(DB, 'include'), )
++            del db_try_this['db3']
++
+         db_search_order = db_try_this.keys()
+         db_search_order.sort()
+         db_search_order.reverse()
+@@ -540,7 +547,7 @@
+                     db_incs = find_file('db.h', [], dbd['incdirs'])
+                     dblib_dir = find_library_file(self.compiler,
+                                                   dblib,
+-                                                  lib_dirs,
++                                                  [],
+                                                   list(dbd['libdirs']))
+                     if (db_incs or dbkey == std_dbinc) and \
+                            dblib_dir is not None: