perl-dbi.patch 2.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. Index: Makefile.PL
  2. --- Makefile.PL.orig 2005-06-20 14:45:11 +0200
  3. +++ Makefile.PL 2005-06-21 21:02:43 +0200
  4. @@ -7,34 +7,6 @@
  5. use ExtUtils::MakeMaker;
  6. use Config;
  7. use strict;
  8. -eval {
  9. - require DBD::SQLite;
  10. - if ($DBD::SQLite::VERSION < 1.0) {
  11. - print <<EOT;
  12. -
  13. -**** WARNING **** WARNING **** WARNING **** WARNING **** WARNING ****
  14. -
  15. -Your version of DBD::SQLite currently installed ($DBD::SQLite::VERSION) uses
  16. -the old sqlite database format. This version of DBD::SQLite will *NOT*
  17. -open these files, and installing this module may cause problems on your
  18. -system. If this is a live environment you should upgrade with caution.
  19. -
  20. -To upgrade a database, download and install both sqlite 2.x and 3.x from
  21. -http://www.sqlite.org/ and issue:
  22. -
  23. - sqlite OLD.DB .dump | sqlite3 NEW.DB
  24. -
  25. -DBD::SQLite will NOT automatically upgrade a database for you, and using
  26. -this version against an old SQLite database WILL lead to database
  27. -corruption.
  28. -
  29. -EOT
  30. - if (prompt("Continue?", "N") !~ /^y/i) {
  31. - print "Exiting\n";
  32. - exit -1;
  33. - }
  34. - }
  35. -};
  36. # 2005/6/19, by rjray@blackperl.com
  37. #
  38. @@ -113,8 +85,9 @@
  39. 'VERSION_FROM' => 'lib/DBD/SQLite.pm', # finds $VERSION
  40. 'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1
  41. 'OBJECT' => ($force_local) ? '$(O_FILES)' : 'SQLite.o dbdimp.o',
  42. - 'INC' => '-I. -I$(DBI_INSTARCH_DIR)' .
  43. + 'INC' => '-I@l_prefix@/include -I$(DBI_INSTARCH_DIR)' .
  44. (($sqlite_inc) ? " -I$sqlite_inc" : ''),
  45. + 'LIBS' => ['-L@l_prefix@/lib -lsqlite3'],
  46. $force_local ? () : ('LIBS' => '-lsqlite3'),
  47. $sqlite_lib ? ('dynamic_lib' => { OTHERLDFLAGS => "-L$sqlite_lib" }) : (),
  48. 'OPTIMIZE' => "-O2",
  49. Index: dbdimp.h
  50. --- dbdimp.h.orig 2004-09-10 17:24:28 +0200
  51. +++ dbdimp.h 2005-06-21 21:01:54 +0200
  52. @@ -4,7 +4,7 @@
  53. #define _DBDIMP_H 1
  54. #include "SQLiteXS.h"
  55. -#include "sqliteInt.h"
  56. +#include "sqlite3.h"
  57. /* 30 second timeout by default */
  58. #define SQL_TIMEOUT 30000