|
| 1 | +--- python2-orig/setup.py 2016-04-14 12:31:17.312895313 +0200 |
| 2 | ++++ python2-patch/setup.py 2016-04-14 12:31:17.312895313 +0200 |
| 3 | +@@ -1020,12 +1020,14 @@ |
| 4 | + missing.append('_bsddb') |
| 5 | + |
| 6 | + # The sqlite interface |
| 7 | +- sqlite_setup_debug = False # verbose debug prints from this script? |
| 8 | ++ sqlite_setup_debug = True # verbose debug prints from this script? |
| 9 | + |
| 10 | + # We hunt for #define SQLITE_VERSION "n.n.n" |
| 11 | + # We need to find >= sqlite version 3.0.8 |
| 12 | +- sqlite_incdir = sqlite_libdir = None |
| 13 | +- sqlite_inc_paths = [ '/usr/include', |
| 14 | ++ sqlite_incdir = 'SQLITE_RECIPE_INC' |
| 15 | ++ sqlite_libdir = 'SQLITE_RECIPE_LIB' |
| 16 | ++ sqlite_inc_paths = [ sqlite_incdir, |
| 17 | ++ '/usr/include', |
| 18 | + '/usr/include/sqlite', |
| 19 | + '/usr/include/sqlite3', |
| 20 | + '/usr/local/include', |
| 21 | +@@ -1071,7 +1073,7 @@ |
| 22 | + print "sqlite: %s had no SQLITE_VERSION"%(f,) |
| 23 | + |
| 24 | + if sqlite_incdir: |
| 25 | +- sqlite_dirs_to_check = [ |
| 26 | ++ sqlite_dirs_to_check = [ sqlite_libdir, |
| 27 | + os.path.join(sqlite_incdir, '..', 'lib64'), |
| 28 | + os.path.join(sqlite_incdir, '..', 'lib'), |
| 29 | + os.path.join(sqlite_incdir, '..', '..', 'lib64'), |
| 30 | +@@ -1083,6 +1085,8 @@ |
| 31 | + sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))] |
| 32 | + |
| 33 | + if sqlite_incdir and sqlite_libdir: |
| 34 | ++ if sqlite_setup_debug: |
| 35 | ++ print "sqlite_libdir: %s"%(sqlite_libdir,) |
| 36 | + sqlite_srcs = ['_sqlite/cache.c', |
| 37 | + '_sqlite/connection.c', |
| 38 | + '_sqlite/cursor.c', |
0 commit comments